diff options
| author | Laurent Vivier | 2018-04-01 22:46:53 +0200 |
|---|---|---|
| committer | Laurent Vivier | 2018-04-03 11:49:49 +0200 |
| commit | 95a29a4e3edb3eabde37587b2bcc9d4874c5306f (patch) | |
| tree | ba17f571e6897ff2a5254cee1018921868c48694 /linux-user | |
| parent | Merge remote-tracking branch 'remotes/riscv/tags/riscv-qemu-2.12-critical-fix... (diff) | |
| download | qemu-95a29a4e3edb3eabde37587b2bcc9d4874c5306f.tar.gz qemu-95a29a4e3edb3eabde37587b2bcc9d4874c5306f.tar.xz qemu-95a29a4e3edb3eabde37587b2bcc9d4874c5306f.zip | |
linux-user: fix alpha signal emulation
setup_frame() doesn't set correctly the address of the trampoline code.
The offset of retcode array must be added to the stack frame address.
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20180401204653.14211-1-laurent@vivier.eu>
Diffstat (limited to 'linux-user')
| -rw-r--r-- | linux-user/signal.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linux-user/signal.c b/linux-user/signal.c index 2ea3e0321f..9399f0ec47 100644 --- a/linux-user/signal.c +++ b/linux-user/signal.c @@ -6367,7 +6367,7 @@ static void setup_frame(int sig, struct target_sigaction *ka, &frame->retcode[1]); __put_user(INSN_CALLSYS, &frame->retcode[2]); /* imb() */ - r26 = frame_addr; + r26 = frame_addr + offsetof(struct target_sigframe, retcode); } unlock_user_struct(frame, frame_addr, 1); @@ -6424,7 +6424,7 @@ static void setup_rt_frame(int sig, struct target_sigaction *ka, &frame->retcode[1]); __put_user(INSN_CALLSYS, &frame->retcode[2]); /* imb(); */ - r26 = frame_addr; + r26 = frame_addr + offsetof(struct target_sigframe, retcode); } if (err) { |