[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 11/25] linux-user/x86_64: Raise SIGSEGV if SA_RESTORER not set
From: |
Richard Henderson |
Subject: |
[PATCH v4 11/25] linux-user/x86_64: Raise SIGSEGV if SA_RESTORER not set |
Date: |
Mon, 27 Sep 2021 22:00:25 -0400 |
This has been a fixme for some time. The effect of
returning -EFAULT from the kernel code is to raise SIGSEGV.
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
linux-user/i386/signal.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/linux-user/i386/signal.c b/linux-user/i386/signal.c
index b38b5f108e..433efa3d69 100644
--- a/linux-user/i386/signal.c
+++ b/linux-user/i386/signal.c
@@ -421,19 +421,18 @@ void setup_rt_frame(int sig, struct target_sigaction *ka,
/* Set up to return from userspace. If provided, use a stub
already in userspace. */
-#ifndef TARGET_X86_64
if (ka->sa_flags & TARGET_SA_RESTORER) {
__put_user(ka->sa_restorer, &frame->pretcode);
} else {
+#ifdef TARGET_X86_64
+ /* For x86_64, SA_RESTORER is required ABI. */
+ goto give_sigsegv;
+#else
/* This is no longer used, but is retained for ABI compatibility. */
install_rt_sigtramp(frame->retcode);
__put_user(default_rt_sigreturn, &frame->pretcode);
- }
-#else
- /* XXX: Would be slightly better to return -EFAULT here if test fails
- assert(ka->sa_flags & TARGET_SA_RESTORER); */
- __put_user(ka->sa_restorer, &frame->pretcode);
#endif
+ }
/* Set up registers for signal handler */
env->regs[R_ESP] = frame_addr;
--
2.25.1
- [PATCH v4 00/25] linux-user: Move signal trampolines to new page, Richard Henderson, 2021/09/27
- [PATCH v4 06/25] linux-user/alpha: Implement setup_sigtramp, Richard Henderson, 2021/09/27
- [PATCH v4 03/25] linux-user/arm: Drop v1 signal frames, Richard Henderson, 2021/09/27
- [PATCH v4 05/25] linux-user/arm: Implement setup_sigtramp, Richard Henderson, 2021/09/27
- [PATCH v4 02/25] linux-user/aarch64: Implement setup_sigtramp, Richard Henderson, 2021/09/27
- [PATCH v4 01/25] linux-user: Add infrastructure for a signal trampoline page, Richard Henderson, 2021/09/27
- [PATCH v4 11/25] linux-user/x86_64: Raise SIGSEGV if SA_RESTORER not set,
Richard Henderson <=
- [PATCH v4 10/25] linux-user/i386: Implement setup_sigtramp, Richard Henderson, 2021/09/27
- [PATCH v4 14/25] linux-user/mips: Tidy install_sigtramp, Richard Henderson, 2021/09/27
- [PATCH v4 12/25] linux-user/m68k: Implement setup_sigtramp, Richard Henderson, 2021/09/27
- [PATCH v4 16/25] linux-user/nios2: Document non-use of setup_sigtramp, Richard Henderson, 2021/09/27
- [PATCH v4 18/25] linux-user/ppc: Simplify encode_trampoline, Richard Henderson, 2021/09/27
- [PATCH v4 07/25] linux-user/cris: Implement setup_sigtramp, Richard Henderson, 2021/09/27
- [PATCH v4 09/25] linux-user/hppa: Document non-use of setup_sigtramp, Richard Henderson, 2021/09/27
- [PATCH v4 13/25] linux-user/microblaze: Implement setup_sigtramp, Richard Henderson, 2021/09/27