[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 37/59] linux-user/s390x: Fix trace in restore_regs
From: |
Laurent Vivier |
Subject: |
[PULL 37/59] linux-user/s390x: Fix trace in restore_regs |
Date: |
Mon, 17 May 2021 20:14:02 +0200 |
From: Richard Henderson <richard.henderson@linaro.org>
Directly reading sc->regs.psw.addr misses the bswap
that may be performed by __get_user.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: David Hildenbrand <david@redhat.com>
Message-Id: <20210428193408.233706-6-richard.henderson@linaro.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
linux-user/s390x/signal.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/linux-user/s390x/signal.c b/linux-user/s390x/signal.c
index e455a9818dea..dcc6f7bc0274 100644
--- a/linux-user/s390x/signal.c
+++ b/linux-user/s390x/signal.c
@@ -232,16 +232,17 @@ give_sigsegv:
static void restore_sigregs(CPUS390XState *env, target_sigregs *sc)
{
+ target_ulong prev_addr;
int i;
for (i = 0; i < 16; i++) {
__get_user(env->regs[i], &sc->regs.gprs[i]);
}
+ prev_addr = env->psw.addr;
__get_user(env->psw.mask, &sc->regs.psw.mask);
- trace_user_s390x_restore_sigregs(env, (unsigned long
long)sc->regs.psw.addr,
- (unsigned long long)env->psw.addr);
__get_user(env->psw.addr, &sc->regs.psw.addr);
+ trace_user_s390x_restore_sigregs(env, env->psw.addr, prev_addr);
for (i = 0; i < 16; i++) {
__get_user(env->aregs[i], &sc->regs.acrs[i]);
--
2.31.1
- [PULL 21/59] linux-user/sparc: Fix the stackframe structure, (continued)
- [PULL 21/59] linux-user/sparc: Fix the stackframe structure, Laurent Vivier, 2021/05/17
- [PULL 04/59] linux-user/arm: Do not emulate fpa11 in thumb mode, Laurent Vivier, 2021/05/17
- [PULL 09/59] linux-user: Use target_restore_altstack in all sigreturn, Laurent Vivier, 2021/05/17
- [PULL 10/59] linux-user: Pass CPUArchState to do_sigaltstack, Laurent Vivier, 2021/05/17
- [PULL 29/59] linux-user/sparc: Add 64-bit support to fpu save/restore, Laurent Vivier, 2021/05/17
- [PULL 18/59] linux-user/sparc: Merge sparc64/ into sparc/, Laurent Vivier, 2021/05/17
- [PULL 30/59] linux-user/sparc: Implement sparc32 rt signals, Laurent Vivier, 2021/05/17
- [PULL 32/59] tests/tcg/sparc64: Re-enable linux-test, Laurent Vivier, 2021/05/17
- [PULL 28/59] linux-user/sparc: Minor corrections to do_sigreturn, Laurent Vivier, 2021/05/17
- [PULL 36/59] linux-user/s390x: Remove restore_sigregs return value, Laurent Vivier, 2021/05/17
- [PULL 37/59] linux-user/s390x: Fix trace in restore_regs,
Laurent Vivier <=
- [PULL 23/59] linux-user/sparc: Split out save_reg_win, Laurent Vivier, 2021/05/17
- [PULL 27/59] linux-user/sparc: Clean up setup_frame, Laurent Vivier, 2021/05/17
- [PULL 26/59] linux-user/sparc: Add rwin_save to signal frame, Laurent Vivier, 2021/05/17
- [PULL 33/59] linux-user/s390x: Fix sigframe types, Laurent Vivier, 2021/05/17
- [PULL 34/59] linux-user/s390x: Use uint16_t for signal retcode, Laurent Vivier, 2021/05/17
- [PULL 45/59] linux-user/s390x: Add build asserts for sigset sizes, Laurent Vivier, 2021/05/17
- [PULL 24/59] linux-user/sparc: Clean up get_sigframe, Laurent Vivier, 2021/05/17
- [PULL 58/59] linux-user/elfload: fix filling psinfo->pr_psargs, Laurent Vivier, 2021/05/17
- [PULL 39/59] linux-user/s390x: Use tswap_sigset in setup_rt_frame, Laurent Vivier, 2021/05/17
- [PULL 31/59] linux-user/sparc: Implement sparc64 rt signals, Laurent Vivier, 2021/05/17