aboutsummaryrefslogtreecommitdiff
path: root/linux-user
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2014-12-22 17:47:00 +0000
committerRiku Voipio <riku.voipio@linaro.org>2015-01-27 22:33:57 +0200
commit1669add752d9f29283f8ebf6a863d7b1e2d0f146 (patch)
tree0dddf4b468137e693edd9df3d8484949cb323c3e /linux-user
parentec355f15476fe91b95c4326836d3fe572d8075e1 (diff)
downloadqemu-1669add752d9f29283f8ebf6a863d7b1e2d0f146.zip
qemu-1669add752d9f29283f8ebf6a863d7b1e2d0f146.tar.gz
qemu-1669add752d9f29283f8ebf6a863d7b1e2d0f146.tar.bz2
linux-user: Fix broken m68k signal handling on 64 bit hosts
The m68k signal frame setup code which writes the signal return trampoline code to the stack was assuming that a 'long' was 32 bits; on 64 bit systems this meant we would end up writing the 32 bit (2 insn) trampoline sequence to retaddr+4,retaddr+6 instead of the intended retaddr+0,retaddr+2, resulting in a guest crash when it tried to execute the invalid zero-bytes at retaddr+0. Fix by using uint32_t instead; also use uint16_t rather than short for consistency. This fixes bug LP:1404690. Reported-by: Michel Boaventura Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
Diffstat (limited to 'linux-user')
-rw-r--r--linux-user/signal.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/linux-user/signal.c b/linux-user/signal.c
index 8065710..5bb399e 100644
--- a/linux-user/signal.c
+++ b/linux-user/signal.c
@@ -5066,7 +5066,7 @@ static void setup_frame(int sig, struct target_sigaction *ka,
/* moveq #,d0; trap #0 */
__put_user(0x70004e40 + (TARGET_NR_sigreturn << 16),
- (long *)(frame->retcode));
+ (uint32_t *)(frame->retcode));
/* Set up to return from userspace */
@@ -5200,8 +5200,8 @@ static void setup_rt_frame(int sig, struct target_sigaction *ka,
/* moveq #,d0; notb d0; trap #0 */
__put_user(0x70004600 + ((TARGET_NR_rt_sigreturn ^ 0xff) << 16),
- (long *)(frame->retcode + 0));
- __put_user(0x4e40, (short *)(frame->retcode + 4));
+ (uint32_t *)(frame->retcode + 0));
+ __put_user(0x4e40, (uint16_t *)(frame->retcode + 4));
if (err)
goto give_sigsegv;