From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59058) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YFo2j-0002yh-Ai for qemu-devel@nongnu.org; Mon, 26 Jan 2015 13:05:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YFo2e-0002MJ-Nv for qemu-devel@nongnu.org; Mon, 26 Jan 2015 13:05:45 -0500 Received: from mail-lb0-f175.google.com ([209.85.217.175]:39693) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YFo2d-0002Li-SH for qemu-devel@nongnu.org; Mon, 26 Jan 2015 13:05:40 -0500 Received: by mail-lb0-f175.google.com with SMTP id 10so8984351lbg.6 for ; Mon, 26 Jan 2015 10:05:39 -0800 (PST) MIME-Version: 1.0 In-Reply-To: <1419270420-10699-1-git-send-email-peter.maydell@linaro.org> References: <1419270420-10699-1-git-send-email-peter.maydell@linaro.org> From: Peter Maydell Date: Mon, 26 Jan 2015 18:05:19 +0000 Message-ID: Content-Type: text/plain; charset=UTF-8 Subject: Re: [Qemu-devel] [PATCH] linux-user: Fix broken m68k signal handling on 64 bit hosts List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: QEMU Developers Cc: Riku Voipio Ping? thanks -- PMM On 22 December 2014 at 17:47, Peter Maydell wrote: > 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 > --- > linux-user/signal.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/linux-user/signal.c b/linux-user/signal.c > index e11b208..a324fd1 100644 > --- a/linux-user/signal.c > +++ b/linux-user/signal.c > @@ -5091,7 +5091,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 */ > > @@ -5225,8 +5225,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;