openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

signal/x86/setup_frame: __put_user cleanup 

Remove the remaining check for __put_user return
value, and all the checks for err variable which
isn't set anywhere anymore.

No we can only end up in give_sigsegv due to failed
lock_user_struct - thus we remove the unlock_user_struct
to avoid unlocking a region never locked.

Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Riku Voipio 2014-04-23 10:34:53 +03:00
parent 1d8b512bbc
commit 7df2fa3623
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
linux-user/signal.c
View File

@ -911,7 +911,7 @@ static void setup_frame(int sig, struct target_sigaction *ka,
{ {
abi_ulong frame_addr; abi_ulong frame_addr;
struct sigframe *frame; struct sigframe *frame;
int i, err = 0; int i;
frame_addr = get_sigframe(ka, env, sizeof(*frame)); frame_addr = get_sigframe(ka, env, sizeof(*frame));
@ -920,18 +920,13 @@ static void setup_frame(int sig, struct target_sigaction *ka,
__put_user(current_exec_domain_sig(sig), __put_user(current_exec_domain_sig(sig),
&frame->sig); &frame->sig);
if (err)
goto give_sigsegv;
setup_sigcontext(&frame->sc, &frame->fpstate, env, set->sig[0], setup_sigcontext(&frame->sc, &frame->fpstate, env, set->sig[0],
frame_addr + offsetof(struct sigframe, fpstate)); frame_addr + offsetof(struct sigframe, fpstate));
if (err)
goto give_sigsegv;
for(i = 1; i < TARGET_NSIG_WORDS; i++) { for(i = 1; i < TARGET_NSIG_WORDS; i++) {
if (__put_user(set->sig[i], &frame->extramask[i - 1])) __put_user(set->sig[i], &frame->extramask[i - 1]);
goto give_sigsegv; }
}
/* Set up to return from userspace. If provided, use a stub /* Set up to return from userspace. If provided, use a stub
already in userspace. */ already in userspace. */
@ -950,8 +945,6 @@ static void setup_frame(int sig, struct target_sigaction *ka,
__put_user(val16, (uint16_t *)(frame->retcode+6)); __put_user(val16, (uint16_t *)(frame->retcode+6));
} }
if (err)
goto give_sigsegv;
/* Set up registers for signal handler */ /* Set up registers for signal handler */
env->regs[R_ESP] = frame_addr; env->regs[R_ESP] = frame_addr;
@ -968,7 +961,6 @@ static void setup_frame(int sig, struct target_sigaction *ka,
return; return;
give_sigsegv: give_sigsegv:
unlock_user_struct(frame, frame_addr, 1);
if (sig == TARGET_SIGSEGV) if (sig == TARGET_SIGSEGV)
ka->_sa_handler = TARGET_SIG_DFL; ka->_sa_handler = TARGET_SIG_DFL;
force_sig(TARGET_SIGSEGV /* , current */); force_sig(TARGET_SIGSEGV /* , current */);