From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.7 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, HTML_MESSAGE,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 707A8C2D0C3 for ; Fri, 27 Dec 2019 23:39:02 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2E4BA20828 for ; Fri, 27 Dec 2019 23:39:02 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2E4BA20828 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=us.ibm.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:39622 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ikzC9-00035C-7c for qemu-devel@archiver.kernel.org; Fri, 27 Dec 2019 18:39:01 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42784) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ikzB9-00024n-NH for qemu-devel@nongnu.org; Fri, 27 Dec 2019 18:38:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ikzB8-0001PC-H1 for qemu-devel@nongnu.org; Fri, 27 Dec 2019 18:37:59 -0500 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:32214) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ikzB3-0001Gf-Tp; Fri, 27 Dec 2019 18:37:54 -0500 Received: from pps.filterd (m0098394.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id xBRNWMed119814; Fri, 27 Dec 2019 18:37:52 -0500 Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com with ESMTP id 2x5jh23yak-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 27 Dec 2019 18:37:52 -0500 Received: from m0098394.ppops.net (m0098394.ppops.net [127.0.0.1]) by pps.reinject (8.16.0.36/8.16.0.36) with SMTP id xBRNbZvi011053; Fri, 27 Dec 2019 18:37:51 -0500 Received: from ppma03dal.us.ibm.com (b.bd.3ea9.ip4.static.sl-reverse.com [169.62.189.11]) by mx0a-001b2d01.pphosted.com with ESMTP id 2x5jh23yac-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 27 Dec 2019 18:37:51 -0500 Received: from pps.filterd (ppma03dal.us.ibm.com [127.0.0.1]) by ppma03dal.us.ibm.com (8.16.0.27/8.16.0.27) with SMTP id xBRNZ2bF005868; Fri, 27 Dec 2019 23:37:50 GMT Received: from b03cxnp07029.gho.boulder.ibm.com (b03cxnp07029.gho.boulder.ibm.com [9.17.130.16]) by ppma03dal.us.ibm.com with ESMTP id 2x1b17st3j-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 27 Dec 2019 23:37:50 +0000 Received: from b03ledav002.gho.boulder.ibm.com (b03ledav002.gho.boulder.ibm.com [9.17.130.233]) by b03cxnp07029.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id xBRNbnFv50790692 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 27 Dec 2019 23:37:49 GMT Received: from b03ledav002.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 46447136051; Fri, 27 Dec 2019 23:37:49 +0000 (GMT) Received: from b03ledav002.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 16A6113604F; Fri, 27 Dec 2019 23:37:49 +0000 (GMT) Received: from mail.gmx.ibm.com (unknown [9.209.242.114]) by b03ledav002.gho.boulder.ibm.com (Postfix) with ESMTPS; Fri, 27 Dec 2019 23:37:48 +0000 (GMT) Received: from m01ex005.gmx.ibm.com (10.148.53.45) by m01ex002.gmx.ibm.com (10.148.53.59) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1779.2; Fri, 27 Dec 2019 18:37:29 -0500 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; Fri, 27 Dec 2019 17:37:29 -0600 From: "Marek Dolata - mkdolata@us.ibm.com" To: "qemu-devel@nongnu.org" Subject: [PATCH V3] target/i386: Fix handling of k_gs_base register in 32-bit mode in gdbstub Thread-Topic: [PATCH V3] target/i386: Fix handling of k_gs_base register in 32-bit mode in gdbstub Thread-Index: AdW9DpEk6Fp6hsjMQem1Y2K6sKpubQ== Date: Fri, 27 Dec 2019 23:37:29 +0000 Message-ID: <2cf601fe9f2d4447ba4eec653df634ee@us.ibm.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [9.16.14.32] Content-Type: multipart/alternative; boundary="_000_2cf601fe9f2d4447ba4eec653df634eeusibmcom_" 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-27_07:2019-12-24,2019-12-27 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 malwarescore=0 adultscore=0 priorityscore=1501 lowpriorityscore=0 suspectscore=0 phishscore=0 mlxscore=0 mlxlogscore=999 bulkscore=0 clxscore=1015 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-1910280000 definitions=main-1912270190 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy] X-Received-From: 148.163.156.1 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: Eduardo Habkost , "qemu-trivial@nongnu.org" , Doug Gale , Markus Armbruster , Paolo Bonzini , =?iso-8859-1?Q?Philippe_Mathieu-Daud=E9?= , Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" --_000_2cf601fe9f2d4447ba4eec653df634eeusibmcom_ Content-Type: text/plain; charset="iso-8859-1" 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 > --- target/i386/gdbstub.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/i386/gdbstub.c b/target/i386/gdbstub.c index aef25b70f1..572ead641c 100644 --- a/target/i386/gdbstub.c +++ b/target/i386/gdbstub.c @@ -350,15 +350,15 @@ 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; #endif + return 4; case IDX_FP_REGS + 8: cpu_set_fpuc(env, ldl_p(mem_buf)); -- 2.24.1 --_000_2cf601fe9f2d4447ba4eec653df634eeusibmcom_ Content-Type: text/html; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable

Fixes: corrects clobbering of registers appearing after k_= gs_base

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

 

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

---

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

1 file changed, 2 insertions(+), 2 deletions(-)

 

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

index aef25b70f1..572ead641c 100644

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

+++ b/target/i386/gdbstub.c<= /p>

@@ -350,15 +350,15 @@ int x86_cpu_gdb_write_register(C= PUState *cs, uint8_t *mem_buf, int n)

         &nbs= p;   env->segs[R_GS].base =3D ldl_p(mem_buf);

         &nbs= p;   return 4;

 

-#ifdef TARGET_X86_64

         case IDX_= SEG_REGS + 8:

+#ifdef TARGET_X86_64

         &nbs= p;   if (env->hflags & HF_CS64_MASK) {

         &nbs= p;       env->kernelgsbase =3D ldq_p(mem_b= uf);

         &nbs= p;       return 8;

         &nbs= p;   }

         &nbs= p;   env->kernelgsbase =3D ldl_p(mem_buf);

-         &nb= sp;  return 4;

#endif

+         = ;   return 4;

 

         case= IDX_FP_REGS + 8:

         &nbs= p;   cpu_set_fpuc(env, ldl_p(mem_buf));

--

2.24.1

 

--_000_2cf601fe9f2d4447ba4eec653df634eeusibmcom_--