From 083cfd0e4a471c4f76d872ce6b521e6443246b3a Mon Sep 17 00:00:00 2001 From: Julia Hansbrough Date: Tue, 26 Feb 2019 23:57:48 -0800 Subject: executor: update syntax for making W+X fuchsia memory Fuchsia recently changed such that zx_vmar_map can't be declared executable and writeable at the same time; use a new syscall for this purpose. Also made a few errors more informative. --- pkg/csource/generated.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'pkg/csource/generated.go') diff --git a/pkg/csource/generated.go b/pkg/csource/generated.go index 37a032535..497b60da1 100644 --- a/pkg/csource/generated.go +++ b/pkg/csource/generated.go @@ -912,12 +912,16 @@ long syz_mmap(size_t addr, size_t size) fail("zx_object_get_info(ZX_INFO_VMAR) failed: %d", status); zx_handle_t vmo; status = zx_vmo_create(size, 0, &vmo); + if (status != ZX_OK) { + debug("zx_vmo_create failed with: %d", status); + return status; + } + status = zx_vmo_replace_as_executable(vmo, ZX_HANDLE_INVALID, &vmo); if (status != ZX_OK) return status; uintptr_t mapped_addr; status = zx_vmar_map(root, ZX_VM_FLAG_SPECIFIC_OVERWRITE | ZX_VM_FLAG_PERM_READ | ZX_VM_FLAG_PERM_WRITE | ZX_VM_FLAG_PERM_EXECUTE, addr - info.base, vmo, 0, size, - &mapped_addr); return status; } -- cgit mrf-deployment