From patchwork Fri Oct 28 15:24:27 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 9402121 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 84C3D60588 for ; Fri, 28 Oct 2016 15:26:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 759CC2A7DF for ; Fri, 28 Oct 2016 15:26:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 67B892A840; Fri, 28 Oct 2016 15:26:40 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 45C892A7C8 for ; Fri, 28 Oct 2016 15:26:38 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1c091E-0001xY-RF; Fri, 28 Oct 2016 15:24:32 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1c091D-0001xR-9m for xen-devel@lists.xenproject.org; Fri, 28 Oct 2016 15:24:31 +0000 Received: from [193.109.254.147] by server-9.bemta-6.messagelabs.com id F2/0F-16838-EAD63185; Fri, 28 Oct 2016 15:24:30 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrEIsWRWlGSWpSXmKPExsXS6fjDS3dtrnC EwYY2a4vvWyYzOTB6HP5whSWAMYo1My8pvyKBNeNP6waWgu3SFU9/CDYwThDuYuTkEBLIk9jw qp2pi5GDg1fATmJKfwlIWELAUOLp++tsIGEWAVWJ7ZvrQcJsAuoSbc+2s4KERQQMJM4dTepi5 OJgFljIKPH39yxmkBphASuJxY/XQU0UlPi7A2wRM9DwZT1rWSYwcs1CyMxCkoGwtSQe/roFZW tLLFv4mhmknFlAWmL5Pw6IsL1E69nd7KhKQGwviWtTl7AuYORYxahenFpUllqka6aXVJSZnlG Sm5iZo2toYKaXm1pcnJiempOYVKyXnJ+7iREYdgxAsINx3gn/Q4ySHExKorwfwoUjhPiS8lMq MxKLM+KLSnNSiw8xynBwKEnw8uQA5QSLUtNTK9Iyc4ARAJOW4OBREuF1AknzFhck5hZnpkOkT jEqSonzTgNJCIAkMkrz4NpgUXeJUVZKmJcR6BAhnoLUotzMElT5V4ziHIxKwrz3soGm8GTmlc BNfwW0mAlo8fR0AZDFJYkIKakGxjY7E/lZlYrlAumFjZt3fln6YVUfU493jdEhlgLnrA9revo 1tJrj+9dWH9Iv4hO8/vmy4NF1b3hK3l9/1n2x45Sj5c76TLn/T/7Zvp9zz/XcqbT1PP+tXmTI /tRa57jVLtFB+9zH2WdMixyTXu4IKG6b3c61ba3W4pX/p7TuZWxSdLJ1l923WYmlOCPRUIu5q DgRAGXzTwC1AgAA X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1477668267!67463302!1 X-Originating-IP: [137.65.248.74] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 9.0.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 48795 invoked from network); 28 Oct 2016 15:24:29 -0000 Received: from prv-mh.provo.novell.com (HELO prv-mh.provo.novell.com) (137.65.248.74) by server-4.tower-27.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 28 Oct 2016 15:24:29 -0000 Received: from INET-PRV-MTA by prv-mh.provo.novell.com with Novell_GroupWise; Fri, 28 Oct 2016 09:24:27 -0600 Message-Id: <581389CB020000780011A9C1@prv-mh.provo.novell.com> X-Mailer: Novell GroupWise Internet Agent 14.2.1 Date: Fri, 28 Oct 2016 09:24:27 -0600 From: "Jan Beulich" To: "xen-devel" Mime-Version: 1.0 Cc: Andrew Cooper , Kevin Tian , Wei Liu , Jun Nakajima Subject: [Xen-devel] [PATCH] VMX: fix realmode emulation SReg handling X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Commit 0888d36bb2 ("x86/emul: Correct the decoding of SReg3 operands") overlooked three places where x86_seg_cs was assumed to be zero. Signed-off-by: Jan Beulich VMX: fix realmode emulation SReg handling Commit 0888d36bb2 ("x86/emul: Correct the decoding of SReg3 operands") overlooked three places where x86_seg_cs was assumed to be zero. Signed-off-by: Jan Beulich --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -1499,18 +1499,18 @@ static void vmx_update_guest_cr(struct v /* Entering or leaving real mode: adjust the segment registers. * Need to read them all either way, as realmode reads can update * the saved values we'll use when returning to prot mode. */ - for ( s = x86_seg_cs ; s <= x86_seg_tr ; s++ ) + for ( s = 0; s <= x86_seg_tr ; s++ ) vmx_get_segment_register(v, s, ®[s]); v->arch.hvm_vmx.vmx_realmode = realmode; if ( realmode ) { - for ( s = x86_seg_cs ; s <= x86_seg_tr ; s++ ) + for ( s = 0; s <= x86_seg_tr ; s++ ) vmx_set_segment_register(v, s, ®[s]); } else { - for ( s = x86_seg_cs ; s <= x86_seg_tr ; s++ ) + for ( s = 0; s <= x86_seg_tr ; s++ ) if ( !(v->arch.hvm_vmx.vm86_segment_mask & (1<arch.hvm_vmx.vm86_saved_seg[s]); Reviewed-by: Andrew Cooper Sorry for --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -1499,18 +1499,18 @@ static void vmx_update_guest_cr(struct v /* Entering or leaving real mode: adjust the segment registers. * Need to read them all either way, as realmode reads can update * the saved values we'll use when returning to prot mode. */ - for ( s = x86_seg_cs ; s <= x86_seg_tr ; s++ ) + for ( s = 0; s <= x86_seg_tr ; s++ ) vmx_get_segment_register(v, s, ®[s]); v->arch.hvm_vmx.vmx_realmode = realmode; if ( realmode ) { - for ( s = x86_seg_cs ; s <= x86_seg_tr ; s++ ) + for ( s = 0; s <= x86_seg_tr ; s++ ) vmx_set_segment_register(v, s, ®[s]); } else { - for ( s = x86_seg_cs ; s <= x86_seg_tr ; s++ ) + for ( s = 0; s <= x86_seg_tr ; s++ ) if ( !(v->arch.hvm_vmx.vm86_segment_mask & (1<arch.hvm_vmx.vm86_saved_seg[s]);