[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 25/28] linux-user: Use safe_syscall for wait syst
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PATCH v2 25/28] linux-user: Use safe_syscall for wait system calls |
Date: |
Thu, 12 May 2016 18:47:49 +0100 |
From: Timothy E Baldwin <address@hidden>
Use safe_syscall for waitpid, waitid and wait4 syscalls. Note that this
change allows us to implement support for waitid's fifth (rusage) argument
in future; for the moment we ignore it as we have done up til now.
Signed-off-by: Timothy Edward Baldwin <address@hidden>
Message-id: address@hidden
[PMM: Adjust to new safe_syscall convention. Add fifth waitid syscall argument
(which isn't present in the libc interface but is in the syscall ABI)]
Signed-off-by: Peter Maydell <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 0037ee7..d9f4695 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -699,6 +699,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_syscall5(int, waitid, idtype_t, idtype, id_t, id, siginfo_t *, infop, \
+ int, options, struct rusage *, rusage)
static inline int host_to_target_sock_type(int host_type)
{
@@ -6037,7 +6041,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 = get_errno(safe_wait4(arg1, &status, arg3, 0));
if (!is_error(ret) && arg2 && ret
&& put_user_s32(host_to_target_waitstatus(status), arg2))
goto efault;
@@ -6049,7 +6053,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 = get_errno(safe_waitid(arg1, arg2, &info, arg4, NULL));
if (!is_error(ret) && arg3 && info.si_pid != 0) {
if (!(p = lock_user(VERIFY_WRITE, arg3,
sizeof(target_siginfo_t), 0)))
goto efault;
@@ -7761,7 +7765,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 = get_errno(safe_wait4(arg1, &status, arg3, rusage_ptr));
if (!is_error(ret)) {
if (status_ptr && ret) {
status = host_to_target_waitstatus(status);
--
1.9.1
- [Qemu-devel] [PATCH v2 05/28] linux-user: Renumber TARGET_QEMU_ESIGRETURN, make it not arch-specific, (continued)
- [Qemu-devel] [PATCH v2 05/28] linux-user: Renumber TARGET_QEMU_ESIGRETURN, make it not arch-specific, Peter Maydell, 2016/05/12
- [Qemu-devel] [PATCH v2 11/28] linux-user: Support for restarting system calls for SH4 targets, Peter Maydell, 2016/05/12
- [Qemu-devel] [PATCH v2 09/28] linux-user: Support for restarting system calls for PPC targets, Peter Maydell, 2016/05/12
- [Qemu-devel] [PATCH v2 17/28] linux-user: Support for restarting system calls for CRIS targets, Peter Maydell, 2016/05/12
- [Qemu-devel] [PATCH v2 15/28] linux-user: Support for restarting system calls for M68K targets, Peter Maydell, 2016/05/12
- [Qemu-devel] [PATCH v2 01/28] linux-user: Check array bounds in errno conversion, Peter Maydell, 2016/05/12
- [Qemu-devel] [PATCH v2 18/28] linux-user: Support for restarting system calls for tilegx targets, Peter Maydell, 2016/05/12
- [Qemu-devel] [PATCH v2 20/28] linux-user: Support for restarting system calls for Microblaze targets, Peter Maydell, 2016/05/12
- [Qemu-devel] [PATCH v2 25/28] linux-user: Use safe_syscall for wait system calls,
Peter Maydell <=
- [Qemu-devel] [PATCH v2 07/28] linux-user: Support for restarting system calls for ARM targets, Peter Maydell, 2016/05/12
- [Qemu-devel] [PATCH v2 13/28] linux-user: Support for restarting system calls for UniCore32 targets, Peter Maydell, 2016/05/12
- [Qemu-devel] [PATCH v2 04/28] linux-user: Define TARGET_ERESTART* errno values, Peter Maydell, 2016/05/12
- [Qemu-devel] [PATCH v2 22/28] linux-user: Provide safe_syscall for fixing races between signals and syscalls, Peter Maydell, 2016/05/12
- [Qemu-devel] [PATCH v2 06/28] linux-user: Support for restarting system calls for x86 targets, Peter Maydell, 2016/05/12
- [Qemu-devel] [PATCH v2 02/28] linux-user: Consistently return host errnos from do_openat(), Peter Maydell, 2016/05/12
- [Qemu-devel] [PATCH v2 27/28] linux-user: Use safe_syscall for pselect, select syscalls, Peter Maydell, 2016/05/12
- [Qemu-devel] [PATCH v2 24/28] linux-user: Use safe_syscall for open and openat system calls, Peter Maydell, 2016/05/12