From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org, laurent@vivier.eu
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 [thread overview]
Message-ID: <20210928020039.184412-12-richard.henderson@linaro.org> (raw)
In-Reply-To: <20210928020039.184412-1-richard.henderson@linaro.org>
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
next prev parent reply other threads:[~2021-09-28 2:12 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-28 2:00 [PATCH v4 00/25] linux-user: Move signal trampolines to new page Richard Henderson
2021-09-28 2:00 ` [PATCH v4 01/25] linux-user: Add infrastructure for a signal trampoline page Richard Henderson
2021-09-28 2:00 ` [PATCH v4 02/25] linux-user/aarch64: Implement setup_sigtramp Richard Henderson
2021-09-28 2:00 ` [PATCH v4 03/25] linux-user/arm: Drop v1 signal frames Richard Henderson
2021-09-28 2:00 ` [PATCH v4 04/25] linux-user/arm: Drop "_v2" from symbols in signal.c Richard Henderson
2021-09-28 2:00 ` [PATCH v4 05/25] linux-user/arm: Implement setup_sigtramp Richard Henderson
2021-09-28 9:31 ` Peter Maydell
2021-09-28 12:28 ` Richard Henderson
2021-09-28 2:00 ` [PATCH v4 06/25] linux-user/alpha: " Richard Henderson
2021-09-28 2:00 ` [PATCH v4 07/25] linux-user/cris: " Richard Henderson
2021-09-28 2:00 ` [PATCH v4 08/25] linux-user/hexagon: " Richard Henderson
2021-09-28 2:00 ` [PATCH v4 09/25] linux-user/hppa: Document non-use of setup_sigtramp Richard Henderson
2021-09-28 2:00 ` [PATCH v4 10/25] linux-user/i386: Implement setup_sigtramp Richard Henderson
2021-09-28 6:51 ` Philippe Mathieu-Daudé
2021-09-28 2:00 ` Richard Henderson [this message]
2021-09-28 2:00 ` [PATCH v4 12/25] linux-user/m68k: " Richard Henderson
2021-09-28 2:00 ` [PATCH v4 13/25] linux-user/microblaze: " Richard Henderson
2021-09-28 2:00 ` [PATCH v4 14/25] linux-user/mips: Tidy install_sigtramp Richard Henderson
2021-09-28 2:00 ` [PATCH v4 15/25] linux-user/mips: Implement setup_sigtramp Richard Henderson
2021-09-28 2:00 ` [PATCH v4 16/25] linux-user/nios2: Document non-use of setup_sigtramp Richard Henderson
2021-09-28 9:24 ` Peter Maydell
2021-09-28 2:00 ` [PATCH v4 17/25] linux-user/openrisc: Implement setup_sigtramp Richard Henderson
2021-09-28 2:00 ` [PATCH v4 18/25] linux-user/ppc: Simplify encode_trampoline Richard Henderson
2021-09-28 2:00 ` [PATCH v4 19/25] linux-user/ppc: Implement setup_sigtramp Richard Henderson
2021-09-28 2:00 ` [PATCH v4 20/25] linux-user/riscv: " Richard Henderson
2021-09-28 2:00 ` [PATCH v4 21/25] linux-user/s390x: " Richard Henderson
2021-09-28 2:00 ` [PATCH v4 22/25] linux-user/sh4: " Richard Henderson
2021-09-28 2:00 ` [PATCH v4 23/25] linux-user/sparc: " Richard Henderson
2021-09-28 6:54 ` Philippe Mathieu-Daudé
2021-09-29 7:17 ` Mark Cave-Ayland
2021-09-28 2:00 ` [PATCH v4 24/25] linux-user/xtensa: " Richard Henderson
2021-09-28 2:00 ` [PATCH v4 25/25] linux-user: Remove default for TARGET_ARCH_HAS_SIGTRAMP_PAGE Richard Henderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210928020039.184412-12-richard.henderson@linaro.org \
--to=richard.henderson@linaro.org \
--cc=laurent@vivier.eu \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).