motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-07 01:33:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

linux-user: Properly handle sigset arg to pselect

Browse source 
Unblocked signals are never delivered, because we
didn't record the new mask for process_pending_signals.
Handle this with the same mechanism as sigsuspend.

Resolves: https://gitlab.com/qemu-project/qemu/-/issues/834
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20220315084308.433109-4-richard.henderson@linaro.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
This commit is contained in:
Richard Henderson 2022-03-15 01:43:06 -07:00 • committed by Laurent Vivier
parent 0a99f09383
commit cb22603444
1 changed files with 10 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

30
linux-user/syscall.c
View file

@ -1391,14 +1391,12 @@ static abi_long do_pselect6(abi_long arg1, abi_long arg2, abi_long arg3,
* The 6th arg is actually two args smashed together, * The 6th arg is actually two args smashed together,
* so we cannot use the C library. * so we cannot use the C library.
*/ */
sigset_t set;
struct { struct {
sigset_t *set; sigset_t *set;
size_t size; size_t size;
} sig, *sig_ptr; } sig, *sig_ptr;
abi_ulong arg_sigset, arg_sigsize, *arg7; abi_ulong arg_sigset, arg_sigsize, *arg7;
target_sigset_t *target_sigset;
n = arg1; n = arg1;
rfd_addr = arg2; rfd_addr = arg2;
@ -1439,10 +1437,8 @@ static abi_long do_pselect6(abi_long arg1, abi_long arg2, abi_long arg3,
} }
/* Extract the two packed args for the sigset */ /* Extract the two packed args for the sigset */
sig_ptr = NULL;
if (arg6) { if (arg6) {
sig_ptr = &sig;
sig.size = SIGSET_T_SIZE;
arg7 = lock_user(VERIFY_READ, arg6, sizeof(*arg7) * 2, 1); arg7 = lock_user(VERIFY_READ, arg6, sizeof(*arg7) * 2, 1);
if (!arg7) { if (!arg7) {
return -TARGET_EFAULT; return -TARGET_EFAULT;
@ -1452,28 +1448,22 @@ static abi_long do_pselect6(abi_long arg1, abi_long arg2, abi_long arg3,
unlock_user(arg7, arg6, 0); unlock_user(arg7, arg6, 0);
if (arg_sigset) { if (arg_sigset) {
sig.set = &set; ret = process_sigsuspend_mask(&sig.set, arg_sigset, arg_sigsize);
if (arg_sigsize != sizeof(*target_sigset)) { if (ret != 0) {
/* Like the kernel, we enforce correct size sigsets */ return ret;
return -TARGET_EINVAL;
} }
target_sigset = lock_user(VERIFY_READ, arg_sigset, sig_ptr = &sig;
sizeof(*target_sigset), 1); sig.size = SIGSET_T_SIZE;
if (!target_sigset) {
return -TARGET_EFAULT;
}
target_to_host_sigset(&set, target_sigset);
unlock_user(target_sigset, arg_sigset, 0);
} else {
sig.set = NULL;
} }
} else {
sig_ptr = NULL;
} }
ret = get_errno(safe_pselect6(n, rfds_ptr, wfds_ptr, efds_ptr, ret = get_errno(safe_pselect6(n, rfds_ptr, wfds_ptr, efds_ptr,
ts_ptr, sig_ptr)); ts_ptr, sig_ptr));
if (sig_ptr) {
finish_sigsuspend_mask(ret);
}
if (!is_error(ret)) { if (!is_error(ret)) {
if (rfd_addr && copy_to_user_fdset(rfd_addr, &rfds, n)) { if (rfd_addr && copy_to_user_fdset(rfd_addr, &rfds, n)) {
return -TARGET_EFAULT; return -TARGET_EFAULT;