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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 B769EC3A5A5 for ; Tue, 3 Sep 2019 16:30:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 86FE723878 for ; Tue, 3 Sep 2019 16:30:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567528203; bh=bxrFUI1nG1BmpNN44zCd3k8niYE3OXSaDuE/GDf/GAo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=peKhDsLv4MHGUB4P13KLv6FUcKi/Pjco534KG3yRKWoSv4wT2sk2q6d/li4l0ZKRq HAAuxhJdIhFCYLsrV8MgzuViNY1LQACCdvWrUmNhMRUjFfEKFCw+SuIeOC1F8es3le FAIufVkqoiUKcAMXz3UOWhmMywujRTLyh6qD0Y6s= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730721AbfICQ37 (ORCPT ); Tue, 3 Sep 2019 12:29:59 -0400 Received: from mail.kernel.org ([198.145.29.99]:51594 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731246AbfICQ3D (ORCPT ); Tue, 3 Sep 2019 12:29:03 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D727323431; Tue, 3 Sep 2019 16:29:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567528142; bh=bxrFUI1nG1BmpNN44zCd3k8niYE3OXSaDuE/GDf/GAo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ECElFg7DzI8TItT3ZMmA1DUp0iAhIukaTJEF5Z0ExfsZE3+59eHKQoGubXV5cJISx 71+6Y+8A1H7ylo6bd1epYuqW1ATj1/TE33q1ksbWJMl+FBmUxxGXr+7/8SI7YM2tsC N8vRxBDWu10P1TSs4WQozikZC+DztdltxvGmFcAA= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Sean Christopherson , Nadav Amit , Paolo Bonzini , Sasha Levin , kvm@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 133/167] KVM: VMX: Always signal #GP on WRMSR to MSR_IA32_CR_PAT with bad value Date: Tue, 3 Sep 2019 12:24:45 -0400 Message-Id: <20190903162519.7136-133-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190903162519.7136-1-sashal@kernel.org> References: <20190903162519.7136-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org From: Sean Christopherson [ Upstream commit d28f4290b53a157191ed9991ad05dffe9e8c0c89 ] The behavior of WRMSR is in no way dependent on whether or not KVM consumes the value. Fixes: 4566654bb9be9 ("KVM: vmx: Inject #GP on invalid PAT CR") Cc: stable@vger.kernel.org Cc: Nadav Amit Signed-off-by: Sean Christopherson Signed-off-by: Paolo Bonzini Signed-off-by: Sasha Levin --- arch/x86/kvm/vmx.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index feff7ed44a2bb..e4bba840a0708 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -4265,9 +4265,10 @@ static int vmx_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info) MSR_TYPE_W); break; case MSR_IA32_CR_PAT: + if (!kvm_pat_valid(data)) + return 1; + if (vmcs_config.vmentry_ctrl & VM_ENTRY_LOAD_IA32_PAT) { - if (!kvm_pat_valid(data)) - return 1; vmcs_write64(GUEST_IA32_PAT, data); vcpu->arch.pat = data; break; -- 2.20.1