From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jim Mattson Subject: [PATCH 1/2] KVM: nVMX: Fix nested_vmx_check_msr_bitmap_controls Date: Thu, 25 May 2017 11:01:13 -0700 Message-ID: <20170525180114.131500-1-jmattson@google.com> Cc: Jim Mattson To: kvm@vger.kernel.org, Wincy Van Return-path: Received: from mail-pf0-f172.google.com ([209.85.192.172]:36269 "EHLO mail-pf0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935955AbdEYSBs (ORCPT ); Thu, 25 May 2017 14:01:48 -0400 Received: by mail-pf0-f172.google.com with SMTP id m17so173999272pfg.3 for ; Thu, 25 May 2017 11:01:48 -0700 (PDT) Sender: kvm-owner@vger.kernel.org List-ID: Allow the L1 guest to specify the last page of addressable guest physical memory for an L2 MSR permission bitmap. Fixes: 3af18d9c5fe95 ("KVM: nVMX: Prepare for using hardware MSR bitmap") Signed-off-by: Jim Mattson --- arch/x86/kvm/vmx.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index c6f4ad44aa95..ae641c8d4284 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -4624,6 +4624,11 @@ static bool guest_state_valid(struct kvm_vcpu *vcpu) return true; } +static bool page_address_valid(struct kvm_vcpu *vcpu, gpa_t gpa) +{ + return PAGE_ALIGNED(gpa) && !(gpa >> cpuid_maxphyaddr(vcpu)); +} + static int init_rmode_tss(struct kvm *kvm) { gfn_t fn; @@ -9582,9 +9587,6 @@ static void vmx_start_preemption_timer(struct kvm_vcpu *vcpu) static int nested_vmx_check_msr_bitmap_controls(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12) { - int maxphyaddr; - u64 addr; - if (!nested_cpu_has(vmcs12, CPU_BASED_USE_MSR_BITMAPS)) return 0; @@ -9592,10 +9594,8 @@ static int nested_vmx_check_msr_bitmap_controls(struct kvm_vcpu *vcpu, WARN_ON(1); return -EINVAL; } - maxphyaddr = cpuid_maxphyaddr(vcpu); - if (!PAGE_ALIGNED(vmcs12->msr_bitmap) || - ((addr + PAGE_SIZE) >> maxphyaddr)) + if (!page_address_valid(vcpu, vmcs12->msr_bitmap)) return -EINVAL; return 0; -- 2.13.0.219.gdb65acc882-goog