aboutsummaryrefslogtreecommitdiff
path: root/linux-user
diff options
context:
space:
mode:
authorRichard Henderson <richard.henderson@linaro.org>2021-04-28 12:34:05 -0700
committerLaurent Vivier <laurent@vivier.eu>2021-05-15 21:44:38 +0200
commitac1a92ec8f1328141707965bb1df4252fdb76b68 (patch)
tree3b7b4325145e616b74fe58d395ebcbbc58a4f3a4 /linux-user
parent6c18757dc55f0a47d926cec1aaab8c349a65a0c6 (diff)
linux-user/s390x: Fix frame_addr corruption in setup_frame
The original value of frame_addr is still required for its use in the call to unlock_user_struct below. Signed-off-by: Richard Henderson <richard.henderson@linaro.org> Reviewed-by: David Hildenbrand <david@redhat.com> Message-Id: <20210428193408.233706-13-richard.henderson@linaro.org> Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Diffstat (limited to 'linux-user')
-rw-r--r--linux-user/s390x/signal.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/linux-user/s390x/signal.c b/linux-user/s390x/signal.c
index bc41b01c5d..81ba59b46a 100644
--- a/linux-user/s390x/signal.c
+++ b/linux-user/s390x/signal.c
@@ -168,7 +168,7 @@ void setup_frame(int sig, struct target_sigaction *ka,
env->psw.addr = ka->_sa_handler;
env->regs[2] = sig;
- env->regs[3] = frame_addr += offsetof(typeof(*frame), sc);
+ env->regs[3] = frame_addr + offsetof(typeof(*frame), sc);
/*
* We forgot to include these in the sigcontext.