[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 5/5] linux-user: Properly handle sigset arg to ppoll
From: |
Richard Henderson |
Subject: |
[PATCH 5/5] linux-user: Properly handle sigset arg to ppoll |
Date: |
Tue, 15 Mar 2022 01:43:08 -0700 |
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>
---
linux-user/syscall.c | 24 +++++++-----------------
1 file changed, 7 insertions(+), 17 deletions(-)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 85de4e1bc7..a69b7084f1 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -1519,8 +1519,7 @@ static abi_long do_ppoll(abi_long arg1, abi_long arg2,
abi_long arg3,
}
if (ppoll) {
struct timespec _timeout_ts, *timeout_ts = &_timeout_ts;
- target_sigset_t *target_set;
- sigset_t _set, *set = &_set;
+ sigset_t *set = NULL;
if (arg3) {
if (time64) {
@@ -1539,25 +1538,19 @@ static abi_long do_ppoll(abi_long arg1, abi_long arg2,
abi_long arg3,
}
if (arg4) {
- if (arg5 != sizeof(target_sigset_t)) {
+ ret = process_sigsuspend_mask(&set, arg4, arg5);
+ if (ret != 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,
set, SIGSET_T_SIZE));
+ if (set) {
+ finish_sigsuspend_mask(ret);
+ }
if (!is_error(ret) && arg3) {
if (time64) {
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 {
struct timespec ts, *pts;
--
2.25.1
- [PATCH 0/5] linux-user: signal mask fixes for pselect et al, Richard Henderson, 2022/03/15
- [PATCH 1/5] linux-user/alpha: Fix sigsuspend for big-endian hosts, Richard Henderson, 2022/03/15
- [PATCH 3/5] linux-user: Properly handle sigset arg to pselect, Richard Henderson, 2022/03/15
- [PATCH 4/5] linux-user: Properly handle sigset arg to epoll_pwait, Richard Henderson, 2022/03/15
- [PATCH 2/5] linux-user: Split out helpers for sigsuspend, Richard Henderson, 2022/03/15
- [PATCH 5/5] linux-user: Properly handle sigset arg to ppoll,
Richard Henderson <=
- Re: [PATCH 0/5] linux-user: signal mask fixes for pselect et al, Laurent Vivier, 2022/03/22