[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 10/14] linux-user: fix settime old value location
From: |
Laurent Vivier |
Subject: |
[Qemu-devel] [PULL 10/14] linux-user: fix settime old value location |
Date: |
Thu, 16 Feb 2017 15:22:23 +0100 |
From: Marc-André Lureau <address@hidden>
old_value is the 4th argument of timer_settime(), not the 2nd.
Signed-off-by: Marc-André Lureau <address@hidden>
Signed-off-by: Pranith Kumar <address@hidden>
Reviewed-by: Laurent Vivier <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>
---
linux-user/syscall.c | 8 ++++++--
1 file 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;
}
--
2.9.3
- [Qemu-devel] [PULL 00/14] Linux user for upstream patches, Laurent Vivier, 2017/02/16
- [Qemu-devel] [PULL 13/14] linux-user: Use correct types in load_symbols(), Laurent Vivier, 2017/02/16
- [Qemu-devel] [PULL 01/14] linux-user: remove ifdef __USER_MISC, Laurent Vivier, 2017/02/16
- [Qemu-devel] [PULL 07/14] linux-user: manage two new IFLA host message types, Laurent Vivier, 2017/02/16
- [Qemu-devel] [PULL 09/14] linux-user: Update m68k syscall definitions to match Linux 4.6, Laurent Vivier, 2017/02/16
- [Qemu-devel] [PULL 12/14] linux-user: fill target sigcontext struct accordingly, Laurent Vivier, 2017/02/16
- [Qemu-devel] [PULL 10/14] linux-user: fix settime old value location,
Laurent Vivier <=
- [Qemu-devel] [PULL 08/14] linux-user: Update sh4 syscall definitions to match Linux 4.8, Laurent Vivier, 2017/02/16
- [Qemu-devel] [PULL 11/14] linux-user: fix tcg/mmap test, Laurent Vivier, 2017/02/16
- [Qemu-devel] [PULL 04/14] linux-user: Fix inotify_init1 support, Laurent Vivier, 2017/02/16
- [Qemu-devel] [PULL 02/14] linux-user: drop __cygwin__ ifdef, Laurent Vivier, 2017/02/16
- [Qemu-devel] [PULL 14/14] linux-user: Add FICLONE and FICLONERANGE ioctls, Laurent Vivier, 2017/02/16
- [Qemu-devel] [PULL 03/14] linux-user: Fix s390x safe-syscall for z900, Laurent Vivier, 2017/02/16
- [Qemu-devel] [PULL 06/14] linux-user: Fix mq_open, Laurent Vivier, 2017/02/16
- [Qemu-devel] [PULL 05/14] linux-user: Fix readahead, Laurent Vivier, 2017/02/16