mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

linux-user/s390x: Fix trace in restore_regs

Browse Source 
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>
This commit is contained in:
Richard Henderson 2021-04-28 12:33:58 -07:00 committed by Laurent Vivier
parent e6f960fcbe
commit bd45be9f5f
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
linux-user/s390x/signal.c
View File

@ -232,16 +232,17 @@ give_sigsegv:
static void restore_sigregs(CPUS390XState *env, target_sigregs *sc) static void restore_sigregs(CPUS390XState *env, target_sigregs *sc)
{ {
target_ulong prev_addr;
int i; int i;
for (i = 0; i < 16; i++) { for (i = 0; i < 16; i++) {
__get_user(env->regs[i], &sc->regs.gprs[i]); __get_user(env->regs[i], &sc->regs.gprs[i]);
} }
prev_addr = env->psw.addr;
__get_user(env->psw.mask, &sc->regs.psw.mask); __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); __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++) { for (i = 0; i < 16; i++) {
__get_user(env->aregs[i], &sc->regs.acrs[i]); __get_user(env->aregs[i], &sc->regs.acrs[i]);