[Qemu-devel] [PULL 37/38] linux-user/signal.c: Use s390 target space address instead of host space

[riku . voipio]

From: Chen Gang <address@hidden>

The return address is in target space, so the restorer address needs to
be target space, too.

Signed-off-by: Chen Gang <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
Reviewed-by: Laurent Vivier <address@hidden>
---
 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 c75fb48..28ce921 100644
--- a/linux-user/signal.c
+++ b/linux-user/signal.c
@@ -4159,8 +4159,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));
     }
-- 
2.1.4