[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 25/38] linux-user: Use safe_syscall for wait system c
From: |
riku . voipio |
Subject: |
[Qemu-devel] [PULL 25/38] linux-user: Use safe_syscall for wait system calls |
Date: |
Wed, 25 May 2016 13:31:57 +0300 |
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>
Signed-off-by: Riku Voipio <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);
--
2.1.4
- [Qemu-devel] [PULL 17/38] linux-user: Support for restarting system calls for CRIS targets, (continued)
- [Qemu-devel] [PULL 17/38] linux-user: Support for restarting system calls for CRIS targets, riku . voipio, 2016/05/25
- [Qemu-devel] [PULL 09/38] linux-user: Support for restarting system calls for PPC targets, riku . voipio, 2016/05/25
- [Qemu-devel] [PULL 15/38] linux-user: Support for restarting system calls for M68K targets, riku . voipio, 2016/05/25
- [Qemu-devel] [PULL 20/38] linux-user: Support for restarting system calls for Microblaze targets, riku . voipio, 2016/05/25
- [Qemu-devel] [PULL 19/38] linux-user: Set r14 on exit from microblaze syscall, riku . voipio, 2016/05/25
- [Qemu-devel] [PULL 16/38] linux-user: Support for restarting system calls for S390 targets, riku . voipio, 2016/05/25
- [Qemu-devel] [PULL 21/38] linux-user: Add debug code to exercise restarting system calls, riku . voipio, 2016/05/25
- [Qemu-devel] [PULL 18/38] linux-user: Support for restarting system calls for tilegx targets, riku . voipio, 2016/05/25
- [Qemu-devel] [PULL 23/38] linux-user: Use safe_syscall for read and write system calls, riku . voipio, 2016/05/25
- [Qemu-devel] [PULL 22/38] linux-user: Provide safe_syscall for fixing races between signals and syscalls, riku . voipio, 2016/05/25
- [Qemu-devel] [PULL 25/38] linux-user: Use safe_syscall for wait system calls,
riku . voipio <=
- [Qemu-devel] [PULL 24/38] linux-user: Use safe_syscall for open and openat system calls, riku . voipio, 2016/05/25
- [Qemu-devel] [PULL 28/38] linux-user: Use safe_syscall for futex syscall, riku . voipio, 2016/05/25
- [Qemu-devel] [PULL 26/38] linux-user: Use safe_syscall for execve syscall, riku . voipio, 2016/05/25
- [Qemu-devel] [PULL 27/38] linux-user: Use safe_syscall for pselect, select syscalls, riku . voipio, 2016/05/25
- [Qemu-devel] [PULL 29/38] linux-user: Handle negative values in timespec conversion, riku . voipio, 2016/05/25
- [Qemu-devel] [PULL 31/38] linux-user: Use g_try_malloc() in do_msgrcv(), riku . voipio, 2016/05/25
- [Qemu-devel] [PULL 35/38] linux-user/signal.c: Generate opcode data for restorer in setup_rt_frame, riku . voipio, 2016/05/25
- [Qemu-devel] [PULL 30/38] linux-user: Handle msgrcv error case correctly, riku . voipio, 2016/05/25
- [Qemu-devel] [PULL 32/38] linux-user: x86_64: Don't use 16-bit UIDs, riku . voipio, 2016/05/25
- [Qemu-devel] [PULL 34/38] linux-user: arm: Remove ARM_cpsr and similar #defines, riku . voipio, 2016/05/25