diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2021-09-29 09:05:38 -0400 |
|---|---|---|
| committer | Laurent Vivier <laurent@vivier.eu> | 2021-10-01 12:03:48 +0200 |
| commit | db2055415959bcc81cd6c2f0aa2c23e5f12c1eb6 (patch) | |
| tree | e16006dfe97db441c00dcc1b2c2dbdba7b6a3d18 /linux-user/i386/signal.c | |
| parent | 8ee8a104807f67595c1a1963dbee208a52cc513b (diff) | |
linux-user/x86_64: Raise SIGSEGV if SA_RESTORER not set
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>
Message-Id: <20210929130553.121567-12-richard.henderson@linaro.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Diffstat (limited to 'linux-user/i386/signal.c')
| -rw-r--r-- | linux-user/i386/signal.c | 11 |
1 files 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; |