From d260249e707bef82e50614c32783a2afb808d8ea Mon Sep 17 00:00:00 2001 From: Marco Vanotti Date: Tue, 20 Nov 2018 20:56:43 -0800 Subject: sys/fuchsia: update VMAR syscalls * sys/fuchsia: update vmar syscalls. In a previous zircon commit[0], the vmar related syscalls (like `zx_vmar_map`, `zx_vmar_protect` and `zx_vmar_allocate`) changed the order of their parameters, making putting the flags parameter as the second parameter, and renaming it to "options". This commit modifies vmars.txt so that it reflects the latest state of the syscalls in zircon. I also modified the usage in `executor/common_fuchsia.h` I ran make extract, make generate and compiled syzkaller to test this change. [0]: https://fuchsia-review.googlesource.com/c/zircon/+/168060 * sys/fuchsia run make generate This commit is just the result of running make generate after its parent. This regenerates the definitions for the modified VMAR syscalls. --- executor/common_fuchsia.h | 6 +++--- executor/defs.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'executor') diff --git a/executor/common_fuchsia.h b/executor/common_fuchsia.h index 6c2381d28..b40120b1c 100644 --- a/executor/common_fuchsia.h +++ b/executor/common_fuchsia.h @@ -179,9 +179,9 @@ long syz_mmap(size_t addr, size_t size) if (status != ZX_OK) return status; uintptr_t mapped_addr; - status = zx_vmar_map(root, addr - info.base, vmo, 0, size, - ZX_VM_FLAG_SPECIFIC_OVERWRITE | ZX_VM_FLAG_PERM_READ | - ZX_VM_FLAG_PERM_WRITE | ZX_VM_FLAG_PERM_EXECUTE, + 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; } diff --git a/executor/defs.h b/executor/defs.h index d402015a5..ca9fcbd5a 100644 --- a/executor/defs.h +++ b/executor/defs.h @@ -35,7 +35,7 @@ #if GOARCH_amd64 #define GOARCH "amd64" -#define SYZ_REVISION "e041d30459ccafba3164bdcadc41bd573fff973e" +#define SYZ_REVISION "dd1c90b2481bcb2c9dfb4a2b84b671cb2bf0d196" #define SYZ_EXECUTOR_USES_FORK_SERVER 0 #define SYZ_EXECUTOR_USES_SHMEM 0 #define SYZ_PAGE_SIZE 4096 @@ -45,7 +45,7 @@ #if GOARCH_arm64 #define GOARCH "arm64" -#define SYZ_REVISION "675d49c5342ae2300c2f2d45d826af5790a2ad4a" +#define SYZ_REVISION "e947153b4adcbaea981564a646566a4efa8fdffd" #define SYZ_EXECUTOR_USES_FORK_SERVER 0 #define SYZ_EXECUTOR_USES_SHMEM 0 #define SYZ_PAGE_SIZE 4096 -- cgit mrf-deployment