diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2017-01-19 10:15:32 -0500 |
|---|---|---|
| committer | Laurent Vivier <laurent@vivier.eu> | 2017-02-16 15:29:30 +0100 |
| commit | 40c80b5e9e44dcf89a672ff02952368c75a3b07b (patch) | |
| tree | c5c6b0aa4ef88bb08eaf3ce71cd6299adaf7edf6 | |
| parent | 23d208ce6da11679e8fa9ef69bae21d77bdc026e (diff) | |
| download | qemu-40c80b5e9e44dcf89a672ff02952368c75a3b07b.zip qemu-40c80b5e9e44dcf89a672ff02952368c75a3b07b.tar.gz qemu-40c80b5e9e44dcf89a672ff02952368c75a3b07b.tar.bz2 | |
linux-user: fix settime old value location
old_value is the 4th argument of timer_settime(), not the 2nd.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Pranith Kumar <bobby.prani@gmail.com>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20170119151533.29328-1-bobby.prani@gmail.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
| -rw-r--r-- | linux-user/syscall.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/linux-user/syscall.c b/linux-user/syscall.c index d982a27..f569f82 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -12043,10 +12043,14 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, timer_t htimer = g_posix_timers[timerid]; struct itimerspec hspec_new = {{0},}, hspec_old = {{0},}; - target_to_host_itimerspec(&hspec_new, arg3); + if (target_to_host_itimerspec(&hspec_new, arg3)) { + goto efault; + } ret = get_errno( timer_settime(htimer, arg2, &hspec_new, &hspec_old)); - host_to_target_itimerspec(arg2, &hspec_old); + if (arg4 && host_to_target_itimerspec(arg4, &hspec_old)) { + goto efault; + } } break; } |