ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

linux-user: Fix incorrect offset of tuc_stack in ARM do_sigframe_return_v2 

struct target_ucontext_v2 is not at the begining of the signal frame,
therefore do_sigaltstack was being passed bogus arguments.

As the offset depends on the type of signal frame fixed by passing in the
beginning of the context from do_sigreturn_v2 and do_rt_sigreturn_v2.

Suggested-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Timothy Edward Baldwin <T.E.Baldwin99@members.leeds.ac.uk>
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
This commit is contained in:
Timothy E Baldwin 2016-09-09 19:35:58 +01:00 committed by Riku Voipio
parent 5ea2fc84da
commit 45eafb4d32
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
linux-user/signal.c
View File

@ -2071,7 +2071,8 @@ static abi_ulong *restore_sigframe_v2_iwmmxt(CPUARMState *env,
return (abi_ulong*)(iwmmxtframe + 1); return (abi_ulong*)(iwmmxtframe + 1);
} }
static int do_sigframe_return_v2(CPUARMState *env, target_ulong frame_addr, static int do_sigframe_return_v2(CPUARMState *env,
target_ulong context_addr,
struct target_ucontext_v2 *uc) struct target_ucontext_v2 *uc)
{ {
sigset_t host_set; sigset_t host_set;
@ -2098,8 +2099,11 @@ static int do_sigframe_return_v2(CPUARMState *env, target_ulong frame_addr,
} }
} }
if (do_sigaltstack(frame_addr + offsetof(struct target_ucontext_v2, tuc_stack), 0, get_sp_from_cpustate(env)) == -EFAULT) if (do_sigaltstack(context_addr
+ offsetof(struct target_ucontext_v2, tuc_stack),
0, get_sp_from_cpustate(env)) == -EFAULT) {
return 1; return 1;
}
#if 0 #if 0
/* Send SIGTRAP if we're single-stepping */ /* Send SIGTRAP if we're single-stepping */
@ -2130,7 +2134,10 @@ static long do_sigreturn_v2(CPUARMState *env)
goto badframe; goto badframe;
} }
if (do_sigframe_return_v2(env, frame_addr, &frame->uc)) { if (do_sigframe_return_v2(env,
frame_addr
+ offsetof(struct sigframe_v2, uc),
&frame->uc)) {
goto badframe; goto badframe;
} }
@ -2217,7 +2224,10 @@ static long do_rt_sigreturn_v2(CPUARMState *env)
goto badframe; goto badframe;
} }
if (do_sigframe_return_v2(env, frame_addr, &frame->uc)) { if (do_sigframe_return_v2(env,
frame_addr
+ offsetof(struct rt_sigframe_v2, uc),
&frame->uc)) {
goto badframe; goto badframe;
} }