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>
This commit is contained in:
parent
ef4467e911
commit
b67d80311a
@ -6401,11 +6401,15 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
|
|||||||
break;
|
break;
|
||||||
case TARGET_NR_settimeofday:
|
case TARGET_NR_settimeofday:
|
||||||
{
|
{
|
||||||
struct timeval tv;
|
struct timeval tv, *ptv = NULL;
|
||||||
struct timezone tz, *ptz = NULL;
|
struct timezone tz, *ptz = NULL;
|
||||||
|
|
||||||
if (copy_from_user_timeval(&tv, arg1))
|
if (arg1) {
|
||||||
|
if (copy_from_user_timeval(&tv, arg1)) {
|
||||||
goto efault;
|
goto efault;
|
||||||
|
}
|
||||||
|
ptv = &tv;
|
||||||
|
}
|
||||||
|
|
||||||
if (arg2) {
|
if (arg2) {
|
||||||
if (copy_from_user_timezone(&tz, 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;
|
ptz = &tz;
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = get_errno(settimeofday(&tv, ptz));
|
ret = get_errno(settimeofday(ptv, ptz));
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
#if defined(TARGET_NR_select)
|
#if defined(TARGET_NR_select)
|
||||||
|
Loading…
Reference in New Issue
Block a user