From nobody Fri May 3 23:18:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=us.ibm.com ARC-Seal: i=1; a=rsa-sha256; t=1577460269; cv=none; d=zohomail.com; s=zohoarc; b=BkB4Zwl5NmQ4kh9HULfnhAFYSftqoAS6z67WFxZIJ8JzXG2nXY0790K3LIbStkrnZqIMoOKJnstjsL4i1y/nojOAay4UBImQL1MeNzVcb2FhMVJ9fhaE5vu+W5krxusu9fS3A4fWOgW+hPoEizQpy3pZKzFAFkiqJDH2jdWLxjY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1577460269; h=Content-Type:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=3DNn+/ZaHOeInOOFj/g9abcwTTCfVrVfMguK4KKRZlU=; b=efe1gnZ1MnozdqqSya2sc0w76uMmMztVTNzbwqk8Pn9LuYbK7uNsJ2/0wuVEgr+l6+koam2gCqLLgr9UgEg5uXHabbWWUdgDqN5p7e9+WC9YvCjy982bjd8O+B8RzyeGPIeJp8B9fjSIzTFVfHBbGZzylp7CxlErPOciD6MiLm0= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1577460269662822.7655036993331; Fri, 27 Dec 2019 07:24:29 -0800 (PST) Received: from localhost ([::1]:36396 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ikrTY-0007jL-EL for importer@patchew.org; Fri, 27 Dec 2019 10:24:28 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59156) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ikfZQ-0000Mh-Df for qemu-devel@nongnu.org; Thu, 26 Dec 2019 21:41:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ikfZN-0002SB-JO for qemu-devel@nongnu.org; Thu, 26 Dec 2019 21:41:42 -0500 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:21578) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ikfZN-0002S5-Ay; Thu, 26 Dec 2019 21:41:41 -0500 Received: from pps.filterd (m0098393.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id xBR2bTRM077387; Thu, 26 Dec 2019 21:41:39 -0500 Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com with ESMTP id 2x21r80ent-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 26 Dec 2019 21:41:39 -0500 Received: from m0098393.ppops.net (m0098393.ppops.net [127.0.0.1]) by pps.reinject (8.16.0.36/8.16.0.36) with SMTP id xBR2ecY7082925; Thu, 26 Dec 2019 21:41:38 -0500 Received: from ppma04wdc.us.ibm.com (1a.90.2fa9.ip4.static.sl-reverse.com [169.47.144.26]) by mx0a-001b2d01.pphosted.com with ESMTP id 2x21r80enk-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 26 Dec 2019 21:41:38 -0500 Received: from pps.filterd (ppma04wdc.us.ibm.com [127.0.0.1]) by ppma04wdc.us.ibm.com (8.16.0.27/8.16.0.27) with SMTP id xBR2eBYr017166; Fri, 27 Dec 2019 02:41:37 GMT Received: from b03cxnp07029.gho.boulder.ibm.com (b03cxnp07029.gho.boulder.ibm.com [9.17.130.16]) by ppma04wdc.us.ibm.com with ESMTP id 2x1b175kqj-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 27 Dec 2019 02:41:37 +0000 Received: from b03ledav004.gho.boulder.ibm.com (b03ledav004.gho.boulder.ibm.com [9.17.130.235]) by b03cxnp07029.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id xBR2faid32768380 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 27 Dec 2019 02:41:36 GMT Received: from b03ledav004.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id C93497805E; Fri, 27 Dec 2019 02:41:36 +0000 (GMT) Received: from b03ledav004.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 98F7078064; Fri, 27 Dec 2019 02:41:36 +0000 (GMT) Received: from mail.gmx.ibm.com (unknown [9.209.252.213]) by b03ledav004.gho.boulder.ibm.com (Postfix) with ESMTPS; Fri, 27 Dec 2019 02:41:36 +0000 (GMT) Received: from m01ex005.gmx.ibm.com (10.148.53.45) by m01ex010.gmx.ibm.com (10.65.151.232) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1779.2; Thu, 26 Dec 2019 20:41:35 -0600 Received: from m01ex005.gmx.ibm.com ([fe80::7d2d:476:2d5a:cb2f]) by m01ex005.gmx.ibm.com ([fe80::7d2d:476:2d5a:cb2f%9]) with mapi id 15.01.1779.002; Thu, 26 Dec 2019 20:41:29 -0600 From: "Marek Dolata - mkdolata@us.ibm.com" To: "qemu-devel@nongnu.org" Subject: [PATCH] /target/i386: fix gdbstub k_gs_base issue Thread-Topic: [PATCH] /target/i386: fix gdbstub k_gs_base issue Thread-Index: AdW8XtoXUETDbpusTL6rHcn7kOLpDw== Date: Fri, 27 Dec 2019 02:41:29 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [9.16.14.35] Content-Type: multipart/alternative; boundary="_000_f392e1a15634455d8af668b28b88f3b4usibmcom_" MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.95,18.0.572 definitions=2019-12-26_05:2019-12-24,2019-12-26 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 bulkscore=0 phishscore=0 mlxscore=0 malwarescore=0 mlxlogscore=787 clxscore=1011 impostorscore=0 priorityscore=1501 adultscore=0 suspectscore=0 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-1910280000 definitions=main-1912270017 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy] X-Received-From: 148.163.156.1 X-Mailman-Approved-At: Fri, 27 Dec 2019 10:18:33 -0500 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "qemu-trivial@nongnu.org" , Paolo Bonzini , Doug Gale , Markus Armbruster Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" --_000_f392e1a15634455d8af668b28b88f3b4usibmcom_ Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Fixes: corrects clobbering of registers appearing after k_gs_base Buglink: https://bugs.launchpad.net/qemu/+bug/1857640 Signed-off-by: Marek Dolata --- target/i386/gdbstub.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/target/i386/gdbstub.c b/target/i386/gdbstub.c index aef25b70f1..7228d20674 100644 --- a/target/i386/gdbstub.c +++ b/target/i386/gdbstub.c @@ -350,14 +350,16 @@ int x86_cpu_gdb_write_register(CPUState *cs, uint8_t = *mem_buf, int n) env->segs[R_GS].base =3D ldl_p(mem_buf); return 4; -#ifdef TARGET_X86_64 case IDX_SEG_REGS + 8: +#ifdef TARGET_X86_64 if (env->hflags & HF_CS64_MASK) { env->kernelgsbase =3D ldq_p(mem_buf); return 8; } env->kernelgsbase =3D ldl_p(mem_buf); return 4; +#else + return 4; #endif case IDX_FP_REGS + 8: -- 2.21.0 --_000_f392e1a15634455d8af668b28b88f3b4usibmcom_ Content-Type: text/html; charset="us-ascii" Content-Transfer-Encoding: quoted-printable

= Fixes: corrects clobbering of registers appearing after k_gs_base

= Buglink: https://bugs.launchpad.net/qemu/+bug/1857640=

=  

= Signed-off-by: Marek Dolata <mkdolata@us.ibm.com>

= ---

= target/i386/gdbstub.c | 4 +++-

= 1 file changed, 3 insertions(+), 1 deletion(-)

=  

= diff --git a/target/i386/gdbstub.c b/target/i386/gdbstub.c

= index aef25b70f1..7228d20674 100644

= --- a/target/i386/gdbstub.c

= +++ b/target/i386/gdbstub.c

= @@ -350,14 +350,16 @@ int x86_cpu_gdb_write_register(CPUState *cs, uint= 8_t *mem_buf, int n)

=              en= v->segs[R_GS].base =3D ldl_p(mem_buf);

=              re= turn 4;

=

= -#ifdef TARGET_X86_64

=          case IDX_SEG_REGS + 8:=

= +#ifdef TARGET_X86_64

=              if= (env->hflags & HF_CS64_MASK) {

=              &n= bsp;   env->kernelgsbase =3D ldq_p(mem_buf);

=             &nb= sp;    return 8;

=              }<= o:p>

=              en= v->kernelgsbase =3D ldl_p(mem_buf);

=              re= turn 4;

= +#else

= +            ret= urn 4;

= #endif

=

=          case IDX_FP_REGS += ; 8:

= --

= 2.21.0

=  

=  

--_000_f392e1a15634455d8af668b28b88f3b4usibmcom_--