From patchwork Wed Apr 20 07:10:53 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike McCormack X-Patchwork-Id: 92092 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D29831007D9 for ; Wed, 20 Apr 2011 17:10:10 +1000 (EST) Received: from localhost ([::1]:53454 helo=lists2.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QCRY7-00034t-11 for incoming@patchwork.ozlabs.org; Wed, 20 Apr 2011 03:10:07 -0400 Received: from eggs.gnu.org ([140.186.70.92]:41854) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QCRXy-00034n-5U for qemu-devel@nongnu.org; Wed, 20 Apr 2011 03:09:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QCRXw-0008D3-VU for qemu-devel@nongnu.org; Wed, 20 Apr 2011 03:09:58 -0400 Received: from mailout1.samsung.com ([203.254.224.24]:41395) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QCRXw-0008Cv-Kq for qemu-devel@nongnu.org; Wed, 20 Apr 2011 03:09:56 -0400 Received: from epmmp2 (mailout1.samsung.com [203.254.224.24]) by mailout1.samsung.com (Oracle Communications Messaging Exchange Server 7u4-19.01 64bit (built Sep 7 2010)) with ESMTP id <0LJX00AEZVWHA640@mailout1.samsung.com> for qemu-devel@nongnu.org; Wed, 20 Apr 2011 16:09:53 +0900 (KST) Received: from TNRNDGASPAPP1.tn.corp.samsungelectronics.net ([165.213.149.150]) by mmp2.samsung.com (iPlanet Messaging Server 5.2 Patch 2 (built Jul 14 2004)) with ESMTPA id <0LJX00JAQVWH9Q@mmp2.samsung.com> for qemu-devel@nongnu.org; Wed, 20 Apr 2011 16:09:53 +0900 (KST) Received: from [10.254.103.179] ([10.254.103.179]) by TNRNDGASPAPP1.tn.corp.samsungelectronics.net with Microsoft SMTPSVC(6.0.3790.4675); Wed, 20 Apr 2011 16:09:52 +0900 Date: Wed, 20 Apr 2011 16:10:53 +0900 From: Mike McCormack To: riku.voipio@iki.fi Message-id: <4DAE86FD.9060907@samsung.com> MIME-version: 1.0 Content-type: text/plain; charset=ISO-8859-1 Content-transfer-encoding: 7BIT User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.14) Gecko/20110223 Thunderbird/3.1.8 X-OriginalArrivalTime: 20 Apr 2011 07:09:52.0932 (UTC) FILETIME=[F2049640:01CBFF29] X-detected-operating-system: by eggs.gnu.org: Solaris 10 (1203?) X-Received-From: 203.254.224.24 Cc: qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH] Don't translate pointer when in restore_sigcontext X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Fixes crash in i386 when user emulation base address is non-zero. 21797 rt_sigreturn(8,1082124603,1,0,1082126048,1082126248)Exit reason and status: signal 11 Signed-off-by: Mike McCormack --- 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 ce033e9..55277fb 100644 --- a/linux-user/signal.c +++ b/linux-user/signal.c @@ -982,8 +982,8 @@ restore_sigcontext(CPUX86State *env, struct target_sigcontext *sc, int *peax) env->regs[R_ECX] = tswapl(sc->ecx); env->eip = tswapl(sc->eip); - cpu_x86_load_seg(env, R_CS, lduw(&sc->cs) | 3); - cpu_x86_load_seg(env, R_SS, lduw(&sc->ss) | 3); + cpu_x86_load_seg(env, R_CS, lduw_p(&sc->cs) | 3); + cpu_x86_load_seg(env, R_SS, lduw_p(&sc->ss) | 3); tmpflags = tswapl(sc->eflags); env->eflags = (env->eflags & ~0x40DD5) | (tmpflags & 0x40DD5);