From patchwork Thu May 25 18:01:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Mattson X-Patchwork-Id: 9748871 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 A764760246 for ; Thu, 25 May 2017 18:01:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9DB1C27E5A for ; Thu, 25 May 2017 18:01:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 923F128047; Thu, 25 May 2017 18:01:53 +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=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI autolearn=ham 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 4735227E5A for ; Thu, 25 May 2017 18:01:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964992AbdEYSBu (ORCPT ); Thu, 25 May 2017 14:01:50 -0400 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=T/hQ8XvhxqMzcemv3/J01mU5bfXX6ZO4ZagxMN+h36M=; b=Voam6QagiLuVxaWXfJyrmjAisxGVXqjTRkJQEu4GDIHFbPG1ZzdQaGHWZmKrPo1Ntp H5PaP+6elFlZMw5ZeRBfVIWrBCMIhszSSaA9JpHctqDSD1xHso8tYQYi0Gam1yRDiYrx cZXxxYHwwi9flO5AgZEXxKdGweaLypXGxr7rYMYAPDGHBWiukOCpSKbWg9GtqXrQ/60W uWIHPRtQgMHFdwIzfxqh5oyr54M4AAO7h4IfQyIehshZIQAXgBxZ/LAi/Cn4uBfWl34Z 9zr1u3i1i9JWHvgtb26FaEU64nuOL0o81ZvXokL0gwxkuOmHVCm+2+cnTZ3kwUgHMBGu AEjA== 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; bh=T/hQ8XvhxqMzcemv3/J01mU5bfXX6ZO4ZagxMN+h36M=; b=J+4VqN12WQlpHX+LZT3/66ffzdEUSKK2fPX5hJEYcvgenZ9hLlVbSxMWcezLzODlbu 3dgJv8nYBT7cpEjC2+mx32Oe1uYoFFlCeG8ikFrTRbK49kC8L9urskVa2ki2aPrDbSkq 3WnV3vgpLwuIKPHeUpzoBhmHLICkRoC3bZ8NqOCs7WN9UiXVsdtBdUSSGr7GgxyA80Cv 092NqNuElakX8pYEa+tpqEhed5bzVCAVN5waHZbU8AZI4NN1TcIa2cmfiEjAoj/8zhAW 8+X6cEyvdjsNMWQxH6lWpGHSBs0/8d+VvkuKDANqqqx4PTipAnyEQgLmRt3dLzjlDWNY fEpw== X-Gm-Message-State: AODbwcBFgguw7n9GhygBkU05n7X+9HzRVs0zFKsYDfl2J5nqpp5DsV7+ nAnu5Z26XL3HB3iO X-Received: by 10.99.98.66 with SMTP id w63mr46654055pgb.223.1495735308003; Thu, 25 May 2017 11:01:48 -0700 (PDT) Received: from turtle.sea.corp.google.com ([172.31.88.24]) by smtp.gmail.com with ESMTPSA id b65sm16024067pfl.48.2017.05.25.11.01.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 25 May 2017 11:01:47 -0700 (PDT) From: Jim Mattson To: kvm@vger.kernel.org, Wincy Van Cc: 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> X-Mailer: git-send-email 2.13.0.219.gdb65acc882-goog Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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;