On 29 March 2016 at 15:29, <[email protected]> wrote: > From: Chen Gang <[email protected]> > > The return address is in target space, so the restorer address needs to > be target space, too. > > Signed-off-by: Chen Gang <[email protected]> > --- > linux-user/signal.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/linux-user/signal.c b/linux-user/signal.c > index c0a6f7e..6a73321 100644 > --- a/linux-user/signal.c > +++ b/linux-user/signal.c > @@ -4117,8 +4117,8 @@ static void setup_frame(int sig, struct > target_sigaction *ka, > env->regs[14] = (unsigned long) > ka->sa_restorer | PSW_ADDR_AMODE; > } else { > - env->regs[14] = (unsigned long) > - frame->retcode | PSW_ADDR_AMODE; > + env->regs[14] = (frame_addr + offsetof(sigframe, retcode)) > + | PSW_ADDR_AMODE; > __put_user(S390_SYSCALL_OPCODE | TARGET_NR_sigreturn, > (uint16_t *)(frame->retcode)); > }
Reviewed-by: Peter Maydell <[email protected]> thanks -- PMM
