[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 7/7] linux-user/nios2: Use set_sigmask in do_rt_sigreturn
From: |
Richard Henderson |
Subject: |
[PATCH v2 7/7] linux-user/nios2: Use set_sigmask in do_rt_sigreturn |
Date: |
Mon, 20 Dec 2021 18:50:12 -0800 |
Using do_sigprocmask directly was incorrect, as it will
leave the signal blocked by the outer layers of linux-user.
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
linux-user/nios2/signal.c | 2 +-
linux-user/signal.c | 2 --
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/linux-user/nios2/signal.c b/linux-user/nios2/signal.c
index 80e3d42fc9..517cd39270 100644
--- a/linux-user/nios2/signal.c
+++ b/linux-user/nios2/signal.c
@@ -205,7 +205,7 @@ long do_rt_sigreturn(CPUNios2State *env)
}
target_to_host_sigset(&set, &frame->uc.tuc_sigmask);
- do_sigprocmask(SIG_SETMASK, &set, NULL);
+ set_sigmask(&set);
if (rt_restore_ucontext(env, &frame->uc, &rval)) {
goto badframe;
diff --git a/linux-user/signal.c b/linux-user/signal.c
index 6d5e5b698c..8cb33a351c 100644
--- a/linux-user/signal.c
+++ b/linux-user/signal.c
@@ -258,7 +258,6 @@ int do_sigprocmask(int how, const sigset_t *set, sigset_t
*oldset)
return 0;
}
-#if !defined(TARGET_NIOS2)
/* Just set the guest's signal mask to the specified value; the
* caller is assumed to have called block_signals() already.
*/
@@ -268,7 +267,6 @@ void set_sigmask(const sigset_t *set)
ts->signal_mask = *set;
}
-#endif
/* sigaltstack management */
--
2.25.1
- [PATCH v2 0/7] linux-user: nios2 fixes, Richard Henderson, 2021/12/20
- [PATCH v2 1/7] linux-user/nios2: Properly emulate EXCP_TRAP, Richard Henderson, 2021/12/20
- [PATCH v2 2/7] linux-user/nios2: Fixes for signal frame setup, Richard Henderson, 2021/12/20
- [PATCH v2 3/7] linux-user/elfload: Rename ARM_COMMPAGE to HI_COMMPAGE, Richard Henderson, 2021/12/20
- [PATCH v2 4/7] linux-user/nios2: Map a real kuser page, Richard Henderson, 2021/12/20
- [PATCH v2 5/7] linux-user/nios2: Fix EA vs PC confusion, Richard Henderson, 2021/12/20
- [PATCH v2 7/7] linux-user/nios2: Use set_sigmask in do_rt_sigreturn,
Richard Henderson <=
- [PATCH v2 6/7] linux-user/nios2: Fix sigmask in setup_rt_frame, Richard Henderson, 2021/12/20