Skip to content

Commit

Permalink
linux-user/x86_64: Raise SIGSEGV if SA_RESTORER not set
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
rth7680 authored and vivier committed Oct 1, 2021
1 parent 8ee8a10 commit db20554
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions linux-user/i386/signal.c
Expand Up @@ -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;
Expand Down

0 comments on commit db20554

Please sign in to comment.