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.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,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 A5D11C76186 for ; Wed, 24 Jul 2019 19:38:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5C5BF229F4 for ; Wed, 24 Jul 2019 19:38:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563997132; bh=XzcmVw6O0WsNJmZ6Z51KPfrhZeLNXpF1hpRhXfiQhSY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=YvDAhwaNyWRf7becm+FSNA8IPGt7B8CTpMznVs8fFWqZOPPeZBfGXml29J6+IQLv6 JticzrGPUaWctIgtWHyBojGHh7xtDmkqQXJQI4T2RCjeAgaKfCDt0kztg8THVguklx 5mt/RAtfGSxPNRIZSUy5wuSpE2V0tqrhAF9WyKjc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389707AbfGXTim (ORCPT ); Wed, 24 Jul 2019 15:38:42 -0400 Received: from mail.kernel.org ([198.145.29.99]:39456 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389655AbfGXTim (ORCPT ); Wed, 24 Jul 2019 15:38:42 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 39D0F214AF; Wed, 24 Jul 2019 19:38:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563997121; bh=XzcmVw6O0WsNJmZ6Z51KPfrhZeLNXpF1hpRhXfiQhSY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=muWro4cshN81ch2aOCLh9bpH0n2n0B+wi/jRc1wNHdLbpIoPnyulxnl/losStuQ1N g/YhglhbQNwFNm3urOGtx/IO5jO7S0SnkhzWlcpv/eHWCfQQK9ujIrAxoelDAUlKrm 53rFUlqwkCRpg7HP7bN1xW7Gb9i7DhyTRKx+zCdk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Nadav Amit , Sean Christopherson , Paolo Bonzini Subject: [PATCH 5.2 327/413] KVM: VMX: Always signal #GP on WRMSR to MSR_IA32_CR_PAT with bad value Date: Wed, 24 Jul 2019 21:20:18 +0200 Message-Id: <20190724191759.260753063@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190724191735.096702571@linuxfoundation.org> References: <20190724191735.096702571@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Sean Christopherson commit d28f4290b53a157191ed9991ad05dffe9e8c0c89 upstream. 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: Greg Kroah-Hartman --- arch/x86/kvm/vmx/vmx.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) --- a/arch/x86/kvm/vmx/vmx.c +++ b/arch/x86/kvm/vmx/vmx.c @@ -1896,9 +1896,10 @@ static int vmx_set_msr(struct kvm_vcpu * 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;