From patchwork Tue Jan 16 09:34:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tianyu Lan X-Patchwork-Id: 10166269 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 3AC85600CA for ; Tue, 16 Jan 2018 09:34:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 39A69281F9 for ; Tue, 16 Jan 2018 09:34:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2B6772837D; Tue, 16 Jan 2018 09:34:35 +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=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DD67C281F9 for ; Tue, 16 Jan 2018 09:34:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751510AbeAPJeX (ORCPT ); Tue, 16 Jan 2018 04:34:23 -0500 Received: from mail-pg0-f66.google.com ([74.125.83.66]:39196 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751452AbeAPJeV (ORCPT ); Tue, 16 Jan 2018 04:34:21 -0500 Received: by mail-pg0-f66.google.com with SMTP id w17so3368971pgv.6; Tue, 16 Jan 2018 01:34:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=H6Jeq5SEkmActm/hRf4fp0cAI43QVTHP4kTOX/HOzig=; b=kyeguIHutZ4r9B6KGzFwaHhwUOUzWJBsOblTxFNKCzfD3TC5B1PV7CgoQ+zBjCBNeR 9uhRNBwXj11xZnBlfQ1sedL1PPALjnOZzBaVKdPKX8or0sG6AgJu9oGkNJgoxTuzsshF 0uzkigILtnRSqi+oIns5jXVRlreix5ZY+Ia8LYrI4KiTDo+QzJEjZG38HYC8coqhb++C waE5mBvvoitGsjeODQVRVToazQ+F/wa6EzUev1Ba0DnIo3RdvWhFtgX28dfu0jkIZD0x LhR+hZhGcjqQH7XwMQHVVEaUg8CPnjwRPxBl1tCrPhQwpu8Sx7QTmvBYUot06cOKmYCJ GNng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=H6Jeq5SEkmActm/hRf4fp0cAI43QVTHP4kTOX/HOzig=; b=S7v1PrMcBePxBo6YISt574aZQ0Yds4GMeMJsrSLJf5g/8WK0KTQvvnl3L1xP2C2TyB M+BAF2X5VPpwZfH7jnqltsb+ULarHJaSSeOqWnzw17D4MdTUzt9+yOmwvb2nilag0kDj L5J2u3sBDKGh7nK5K/OyGDseYXt2OAiqGsCXnsvG1VVv3Q2oVLwzi557Ius3wBeILFa1 lmhYpwrnKv3nbDb+8cwo50u2kRLd7EC/A5uxn2pbHL38Z6ZgTVQQHc/u2/7g2/8NRKWy UhG/b19vf3BP8TCDsHo7OZQ3T++Ex9QZvr4NS9727zgRkANhvgVzKa7dmIbXEc+HO+0W tLkA== X-Gm-Message-State: AKGB3mKeDYnnGomPFs2FWF4ElTjg3enHuHKTWn/KJYbNl5+abXi36ESO m9ODur9LUAyxpFtwevxrftSSMbmo X-Google-Smtp-Source: ACJfBovzw2bHtaYwnCkNh7BO4g7RGb6pGnpebZ8DWyND3NEjCd4Ld6yH13Eo6ekyeFRUfsA7/+UXnA== X-Received: by 10.101.83.9 with SMTP id m9mr29724096pgq.202.1516095261216; Tue, 16 Jan 2018 01:34:21 -0800 (PST) Received: from tianyukernel.corp.microsoft.com ([2404:f801:9000:19::101]) by smtp.googlemail.com with ESMTPSA id s14sm2466222pgf.16.2018.01.16.01.34.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 16 Jan 2018 01:34:20 -0800 (PST) From: Tianyu Lan X-Google-Original-From: Tianyu Lan Cc: Tianyu Lan , pbonzini@redhat.com, rkrcmar@redhat.com, tglx@linutronix.de, mingo@redhat.com, hpa@zytor.com, x86@kernel.org, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, jeremi.piotrowski@gmail.com Subject: [Resend Patch] KVM/x86: Fix wrong macro references of X86_CR0_PG_BIT and X86_CR4_PAE_BIT in kvm_valid_sregs() Date: Tue, 16 Jan 2018 17:34:07 +0800 Message-Id: <1516095247-21414-1-git-send-email-Tianyu.Lan@microsoft.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 To: unlisted-recipients:; (no To-header on input) Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP kvm_valid_sregs() should use X86_CR0_PG and X86_CR4_PAE to check bit status rather than X86_CR0_PG_BIT and X86_CR4_PAE_BIT. This patch is to fix it. Fixes: f29810335965a(KVM/x86: Check input paging mode when cs.l is set) Reported-by: Jeremi Piotrowski Cc: Paolo Bonzini Cc: Radim Krčmář Signed-off-by: Tianyu Lan --- Sorry for noise. Missed kvm maillist. arch/x86/kvm/x86.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 1cec2c6..c53298d 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -7496,13 +7496,13 @@ EXPORT_SYMBOL_GPL(kvm_task_switch); int kvm_valid_sregs(struct kvm_vcpu *vcpu, struct kvm_sregs *sregs) { - if ((sregs->efer & EFER_LME) && (sregs->cr0 & X86_CR0_PG_BIT)) { + if ((sregs->efer & EFER_LME) && (sregs->cr0 & X86_CR0_PG)) { /* * When EFER.LME and CR0.PG are set, the processor is in * 64-bit mode (though maybe in a 32-bit code segment). * CR4.PAE and EFER.LMA must be set. */ - if (!(sregs->cr4 & X86_CR4_PAE_BIT) + if (!(sregs->cr4 & X86_CR4_PAE) || !(sregs->efer & EFER_LMA)) return -EINVAL; } else {