diff options
| author | Marco Vanotti <mvanotti@users.noreply.github.com> | 2018-11-20 20:56:43 -0800 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2018-11-21 05:56:43 +0100 |
| commit | d260249e707bef82e50614c32783a2afb808d8ea (patch) | |
| tree | 3eb984f4b9c84544fbe42c256c48208d01f22987 /executor/common_fuchsia.h | |
| parent | 5bb36a9ef8c850e01185e9db74a3517bb1670799 (diff) | |
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.
Diffstat (limited to 'executor/common_fuchsia.h')
| -rw-r--r-- | executor/common_fuchsia.h | 6 |
1 files changed, 3 insertions, 3 deletions
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; } |