@@ -6342,11 +6342,14 @@ 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))
@@ -6354,7 +6357,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)
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> --- Changes in v2: - None. --- linux-user/syscall.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)