[Qemu-devel] [PATCH 17/34] linux-user: Use safe_syscall for wait system calls

[Timothy E Baldwin]

Signed-off-by: Timothy Edward Baldwin <address@hidden>
---
 linux-user/syscall.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index e68eddb..281fa2d 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -698,6 +698,10 @@ safe_syscall3(ssize_t, read, int, fd, void *, buff, 
size_t, count)
 safe_syscall3(ssize_t, write, int, fd, const void *, buff, size_t, count)
 safe_syscall4(int, openat, int, dirfd, const char *, pathname, \
     int, flags, mode_t, mode)
+safe_syscall4(pid_t, wait4, pid_t, pid, int *, status, int, options, \
+    struct rusage *, rusage)
+safe_syscall4(int, waitid, idtype_t, idtype, id_t, id, siginfo_t *, infop, \
+    int, options)
 
 
 static inline int host_to_target_sock_type(int host_type)
@@ -5780,7 +5784,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
     case TARGET_NR_waitpid:
         {
             int status;
-            ret = get_errno(waitpid(arg1, &status, arg3));
+            ret = safe_wait4(arg1, &status, arg3, 0);
             if (!is_error(ret) && arg2 && ret
                 && put_user_s32(host_to_target_waitstatus(status), arg2))
                 goto efault;
@@ -5792,7 +5796,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
         {
             siginfo_t info;
             info.si_pid = 0;
-            ret = get_errno(waitid(arg1, arg2, &info, arg4));
+            ret = safe_waitid(arg1, arg2, &info, arg4);
             if (!is_error(ret) && arg3 && info.si_pid != 0) {
                 if (!(p = lock_user(VERIFY_WRITE, arg3, 
sizeof(target_siginfo_t), 0)))
                     goto efault;
@@ -7453,7 +7457,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
                 rusage_ptr = &rusage;
             else
                 rusage_ptr = NULL;
-            ret = get_errno(wait4(arg1, &status, arg3, rusage_ptr));
+            ret = safe_wait4(arg1, &status, arg3, rusage_ptr);
             if (!is_error(ret)) {
                 if (status_ptr && ret) {
                     status = host_to_target_waitstatus(status);
-- 
2.1.4