[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 4/5] linux-user: Properly handle sigset arg to epoll_pwait
From: |
Richard Henderson |
Subject: |
[PATCH 4/5] linux-user: Properly handle sigset arg to epoll_pwait |
Date: |
Tue, 15 Mar 2022 01:43:07 -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 | 22 +++++++---------------
1 file changed, 7 insertions(+), 15 deletions(-)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 8071a5191d..85de4e1bc7 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -12694,29 +12694,21 @@ static abi_long do_syscall1(void *cpu_env, int num,
abi_long arg1,
#if defined(TARGET_NR_epoll_pwait)
case TARGET_NR_epoll_pwait:
{
- target_sigset_t *target_set;
- sigset_t _set, *set = &_set;
+ sigset_t *set = NULL;
if (arg5) {
- if (arg6 != sizeof(target_sigset_t)) {
- ret = -TARGET_EINVAL;
+ ret = process_sigsuspend_mask(&set, arg5, arg6);
+ if (ret != 0) {
break;
}
-
- target_set = lock_user(VERIFY_READ, arg5,
- sizeof(target_sigset_t), 1);
- if (!target_set) {
- ret = -TARGET_EFAULT;
- break;
- }
- target_to_host_sigset(set, target_set);
- unlock_user(target_set, arg5, 0);
- } else {
- set = NULL;
}
ret = get_errno(safe_epoll_pwait(epfd, ep, maxevents, timeout,
set, SIGSET_T_SIZE));
+
+ if (set) {
+ finish_sigsuspend_mask(ret);
+ }
break;
}
#endif
--
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 <=
- [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, 2022/03/15
- Re: [PATCH 0/5] linux-user: signal mask fixes for pselect et al, Laurent Vivier, 2022/03/22