[Qemu-devel] [PATCH 4/4] linux-user: timer_settime fix

[Dejan Jovicevic]

Error handling was improved. host_to_target_itimerspec() was
invoked with arg2 passed instead of arg4.

Signed-off-by: Dejan Jovicevic <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 b4f53b1..cad4269 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -11823,10 +11823,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 (host_to_target_itimerspec(arg4, &hspec_old)) {
+                goto efault;
+            }
         }
         break;
     }
-- 
1.9.1