SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

linux-user: Properly handle sigset arg to ppoll

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.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20220315084308.433109-6-richard.henderson@linaro.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
This commit is contained in:
Richard Henderson 2022-03-15 01:43:08 -07:00 committed by Laurent Vivier
parent cd0e31a49a
commit db36aa7daa
1 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
linux-user/syscall.c
View File

@ -1519,8 +1519,7 @@ static abi_long do_ppoll(abi_long arg1, abi_long arg2, abi_long arg3,
} }
if (ppoll) { if (ppoll) {
struct timespec _timeout_ts, *timeout_ts = &_timeout_ts; struct timespec _timeout_ts, *timeout_ts = &_timeout_ts;
target_sigset_t *target_set; sigset_t *set = NULL;
sigset_t _set, *set = &_set;
if (arg3) { if (arg3) {
if (time64) { if (time64) {
@ -1539,25 +1538,19 @@ static abi_long do_ppoll(abi_long arg1, abi_long arg2, abi_long arg3,
} }
if (arg4) { if (arg4) {
if (arg5 != sizeof(target_sigset_t)) { ret = process_sigsuspend_mask(&set, arg4, arg5);
if (ret != 0) {
unlock_user(target_pfd, arg1, 0); unlock_user(target_pfd, arg1, 0);
return -TARGET_EINVAL; return ret;
} }
target_set = lock_user(VERIFY_READ, arg4,
sizeof(target_sigset_t), 1);
if (!target_set) {
unlock_user(target_pfd, arg1, 0);
return -TARGET_EFAULT;
}
target_to_host_sigset(set, target_set);
} else {
set = NULL;
} }
ret = get_errno(safe_ppoll(pfd, nfds, timeout_ts, ret = get_errno(safe_ppoll(pfd, nfds, timeout_ts,
set, SIGSET_T_SIZE)); set, SIGSET_T_SIZE));
if (set) {
finish_sigsuspend_mask(ret);
}
if (!is_error(ret) && arg3) { if (!is_error(ret) && arg3) {
if (time64) { if (time64) {
if (host_to_target_timespec64(arg3, timeout_ts)) { if (host_to_target_timespec64(arg3, timeout_ts)) {
@ -1569,9 +1562,6 @@ static abi_long do_ppoll(abi_long arg1, abi_long arg2, abi_long arg3,
} }
} }
} }
if (arg4) {
unlock_user(target_set, arg4, 0);
}
} else { } else {
struct timespec ts, *pts; struct timespec ts, *pts;