diff options
| author | Marco Vanotti <mvanotti@users.noreply.github.com> | 2019-07-16 17:09:43 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-16 17:09:43 -0700 |
| commit | 0d10349cf0b4a9f98490378709bd9a83bd0042d6 (patch) | |
| tree | 13d71c3bddfc1af2f8fb837463430ebd7539509d /executor | |
| parent | 4ec4ea48904fe8b1ddfe85e84ea117b9dfdc90f2 (diff) | |
sys/fuchsia: update zx_clock_get syscall (#1292)
* sys/fuchsia: update zx_clock_get.
zx_clock_get was deprecated and replaced by zx_clock_get_new. In a
recent CL[0], they replaced the zx_clock_get by zx_clock_get_new and
moved all client. This commit updates syzkaller to use the new function.
[0]: https://fuchsia-review.googlesource.com/c/fuchsia/+/298575
* run make extract && make generate
Diffstat (limited to 'executor')
| -rw-r--r-- | executor/common_fuchsia.h | 3 | ||||
| -rw-r--r-- | executor/defs.h | 4 | ||||
| -rw-r--r-- | executor/syscalls.h | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/executor/common_fuchsia.h b/executor/common_fuchsia.h index 72b578012..5099100d0 100644 --- a/executor/common_fuchsia.h +++ b/executor/common_fuchsia.h @@ -223,6 +223,7 @@ static long syz_job_default(void) static long syz_future_time(volatile long when) { zx_time_t delta_ms; + zx_time_t now; switch (when) { case 0: delta_ms = 5; @@ -234,7 +235,7 @@ static long syz_future_time(volatile long when) delta_ms = 10000; break; } - zx_time_t now = zx_clock_get(ZX_CLOCK_MONOTONIC); + zx_clock_get(ZX_CLOCK_MONOTONIC, &now); return now + delta_ms * 1000 * 1000; } #endif diff --git a/executor/defs.h b/executor/defs.h index 145119748..42683a008 100644 --- a/executor/defs.h +++ b/executor/defs.h @@ -45,7 +45,7 @@ #if GOARCH_amd64 #define GOARCH "amd64" -#define SYZ_REVISION "10ad2411f1db75aaa4971061b5f008e17d8dd923" +#define SYZ_REVISION "0831ecb34bc4bfd3c444366782fdbd3fafe56026" #define SYZ_EXECUTOR_USES_FORK_SERVER 0 #define SYZ_EXECUTOR_USES_SHMEM 0 #define SYZ_PAGE_SIZE 4096 @@ -55,7 +55,7 @@ #if GOARCH_arm64 #define GOARCH "arm64" -#define SYZ_REVISION "8513a6093b2306314106c924eee6cb5263d85436" +#define SYZ_REVISION "b643855d1cb7438abcacb87d29a4dfdd49961397" #define SYZ_EXECUTOR_USES_FORK_SERVER 0 #define SYZ_EXECUTOR_USES_SHMEM 0 #define SYZ_PAGE_SIZE 4096 diff --git a/executor/syscalls.h b/executor/syscalls.h index a8236cb80..35145562c 100644 --- a/executor/syscalls.h +++ b/executor/syscalls.h @@ -1537,7 +1537,6 @@ const call_t syscalls[] = { {"zx_channel_write$fuchsia_timezone_TimezoneWatcherOnTimezoneOffsetChange", 0, (syscall_t)zx_channel_write}, {"zx_clock_get", 0, (syscall_t)zx_clock_get}, {"zx_clock_get_monotonic", 0, (syscall_t)zx_clock_get_monotonic}, - {"zx_clock_get_new", 0, (syscall_t)zx_clock_get_new}, {"zx_cprng_add_entropy", 0, (syscall_t)zx_cprng_add_entropy}, {"zx_cprng_draw", 0, (syscall_t)zx_cprng_draw}, {"zx_deadline_after", 0, (syscall_t)zx_deadline_after}, @@ -1958,7 +1957,6 @@ const call_t syscalls[] = { {"zx_channel_write$fuchsia_timezone_TimezoneWatcherOnTimezoneOffsetChange", 0, (syscall_t)zx_channel_write}, {"zx_clock_get", 0, (syscall_t)zx_clock_get}, {"zx_clock_get_monotonic", 0, (syscall_t)zx_clock_get_monotonic}, - {"zx_clock_get_new", 0, (syscall_t)zx_clock_get_new}, {"zx_cprng_add_entropy", 0, (syscall_t)zx_cprng_add_entropy}, {"zx_cprng_draw", 0, (syscall_t)zx_cprng_draw}, {"zx_deadline_after", 0, (syscall_t)zx_deadline_after}, |