mii/qemu
1
0
Fork 0
mirror of https://github.com/mii443/qemu.git synced 2025-08-22 23:25:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

linux-user: Fix waitid return of siginfo_t and rusage

Browse Source 
The copy back to siginfo_t should be conditional only on arg3,
not the specific values that might have been written.
The copy back to rusage was missing entirely.

Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2262
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Tested-by: Alex Fan <alex.fan.q@gmail.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
(cherry picked from commit f0907ff4ca)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
This commit is contained in:
Richard Henderson
2024-04-05 11:58:14 -10:00
committed by Michael Tokarev
parent b198998b7f
commit d6e7ec1f8e
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
linux-user/syscall.c
View File

@ -8759,14 +8759,24 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1,
#ifdef TARGET_NR_waitid #ifdef TARGET_NR_waitid
case TARGET_NR_waitid: case TARGET_NR_waitid:
{ {
struct rusage ru;
siginfo_t info; siginfo_t info;
info.si_pid = 0;
ret = get_errno(safe_waitid(arg1, arg2, &info, arg4, NULL)); ret = get_errno(safe_waitid(arg1, arg2, (arg3 ? &info : NULL),
if (!is_error(ret) && arg3 && info.si_pid != 0) { arg4, (arg5 ? &ru : NULL)));
if (!(p = lock_user(VERIFY_WRITE, arg3, sizeof(target_siginfo_t), 0))) if (!is_error(ret)) {
if (arg3) {
p = lock_user(VERIFY_WRITE, arg3,
sizeof(target_siginfo_t), 0);
if (!p) {
return -TARGET_EFAULT;
}
host_to_target_siginfo(p, &info);
unlock_user(p, arg3, sizeof(target_siginfo_t));
}
if (arg5 && host_to_target_rusage(arg5, &ru)) {
return -TARGET_EFAULT; return -TARGET_EFAULT;
host_to_target_siginfo(p, &info); }
unlock_user(p, arg3, sizeof(target_siginfo_t));
} }
} }
return ret; return ret;