diff options
| author | Paul Burton <paul@archlinuxmips.org> | 2014-06-22 11:25:41 +0100 |
|---|---|---|
| committer | Riku Voipio <riku.voipio@linaro.org> | 2014-06-29 14:19:59 +0300 |
| commit | b67d80311a7d081747c0f4a731e0bfd2facf1464 (patch) | |
| tree | f4d57cf73c0b90ba2bed9505f159d26ad9086033 | |
| parent | ef4467e911fc8a8a58c85877152a6ef7f46ed03a (diff) | |
linux-user: allow NULL tv argument for settimeofday
The tv argument to the settimeofday syscall is allowed to be NULL, if
the program only wishes to provide the timezone. QEMU previously
returned -EFAULT when tv was NULL. Instead, execute the syscall &
provide NULL to the kernel as the target program expected.
Signed-off-by: Paul Burton <paul@archlinuxmips.org>
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
| -rw-r--r-- | linux-user/syscall.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 0ce1a4e369..8e2762b0ed 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -6401,11 +6401,15 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, break; case TARGET_NR_settimeofday: { - struct timeval tv; + struct timeval tv, *ptv = NULL; struct timezone tz, *ptz = NULL; - if (copy_from_user_timeval(&tv, arg1)) - goto efault; + if (arg1) { + if (copy_from_user_timeval(&tv, arg1)) { + goto efault; + } + ptv = &tv; + } if (arg2) { if (copy_from_user_timezone(&tz, arg2)) { @@ -6414,7 +6418,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, ptz = &tz; } - ret = get_errno(settimeofday(&tv, ptz)); + ret = get_errno(settimeofday(ptv, ptz)); } break; #if defined(TARGET_NR_select) |