From: Richard Henderson Date: Wed, 28 Apr 2021 19:34:05 +0000 (-0700) Subject: linux-user/s390x: Fix frame_addr corruption in setup_frame X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=ac1a92ec8f1328141707965bb1df4252fdb76b68;p=qemu.git 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 Reviewed-by: David Hildenbrand Message-Id: <20210428193408.233706-13-richard.henderson@linaro.org> Signed-off-by: Laurent Vivier --- 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.