From patchwork Thu Aug 24 20:24:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Mattson X-Patchwork-Id: 9920903 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 B153D60349 for ; Thu, 24 Aug 2017 20:25:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A566628C62 for ; Thu, 24 Aug 2017 20:25:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9A70828C68; Thu, 24 Aug 2017 20:25:52 +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 EF7CC28C71 for ; Thu, 24 Aug 2017 20:25:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753710AbdHXUZA (ORCPT ); Thu, 24 Aug 2017 16:25:00 -0400 Received: from mail-pg0-f43.google.com ([74.125.83.43]:36530 "EHLO mail-pg0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753684AbdHXUY6 (ORCPT ); Thu, 24 Aug 2017 16:24:58 -0400 Received: by mail-pg0-f43.google.com with SMTP id r133so2964685pgr.3 for ; Thu, 24 Aug 2017 13:24:58 -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=PoeAnWDUo3KT+qgw1u5XOKKK811n4hrHMsDy182vPFo=; b=RWaYbmtToRSLu4K9J++NPdaCUmeVikM6yBUOa7X54j0x4BFmxZz6NIWbnCxRKt+PJM tHkHxYv6mq0r86ivEnGKKKSogMcX/vxVM76IubmE9bA0ZnIMSba2YIlN3+nY5hCSuKsT min8nostoLKf2eNgboga9A+sHLXUvWvuAv4cbkxIi7bwIenqN9iavcLHOCpjPzagCZVL ONFsKtaXqW8zEVwWWjMAR6hO4/fd29/SMR0imBrR0VxqGRL0ZeHuPvjoSGBgZjxGm8Bj 6OR5E2w5dnTClepEeDiU1vocV684/Id8RcKAco/bArnyFxEdg8viDznn7OOjb9ZwPGfi GRaQ== 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=PoeAnWDUo3KT+qgw1u5XOKKK811n4hrHMsDy182vPFo=; b=rU/VM/eT//AkRbtZ8DfXoox7YrLV8M1CUVZnYG5lra/wls9Zj6OkZg+eCRv0nZbNPV KEX89LcpTcLI+YM38zZdhpbKXjH2IWNeT3iZjsuH76UCId9dZ5qesDSc2mpu9LWnfJnB hbNXsTxdN05Jilz7NnBEWQpoDAQUyXLfjcmYwVhTdmhEOnOkU3fawb/W1OJb+fz6HN2W HuCip4GpQloI93p7Go/ikl0zOCBrslWkuBbKymajgHzkWwIBaUeoYUFKHl/Q8Mkho1Qk 8VhIyqlukt05FegqOPCW1o+qzu0WRnMvKNKhcxYB9JJ2qoQNbE89/SkTIc4uLPGb0XIn Rljg== X-Gm-Message-State: AHYfb5jqCL24YbXLxONiJ9WY+C2uCGvu1/5TXQpP5MooXMddtOsc2PSm fFcm1wQgd7VMS0E4XMiJNg== X-Google-Smtp-Source: ADKCNb6psQeyaJtZjpubkJgPkXJPGj+WJGpWz0BqBI37ZV2iMhd3sr4xpclcUThi3mIfbUsacqNqzA== X-Received: by 10.101.87.138 with SMTP id b10mr3071203pgr.73.1503606297239; Thu, 24 Aug 2017 13:24:57 -0700 (PDT) Received: from turtle.sea.corp.google.com ([172.31.88.24]) by smtp.gmail.com with ESMTPSA id b63sm5496475pfc.78.2017.08.24.13.24.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 24 Aug 2017 13:24:56 -0700 (PDT) From: Jim Mattson To: kvm@vger.kernel.org Cc: Jim Mattson Subject: [PATCH] kvm: nVMX: Validate the virtual-APIC address on nested VM-entry Date: Thu, 24 Aug 2017 13:24:47 -0700 Message-Id: <20170824202447.61553-1-jmattson@google.com> X-Mailer: git-send-email 2.14.1.342.g6490525c54-goog Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP According to the SDM, if the "use TPR shadow" VM-execution control is 1, bits 11:0 of the virtual-APIC address must be 0 and the address should set any bits beyond the processor's physical-address width. Signed-off-by: Jim Mattson Reviewed-by: David Hildenbrand --- arch/x86/kvm/vmx.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 19aa69af7c2d..abe8caf9756a 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -9915,6 +9915,18 @@ static int nested_vmx_check_msr_bitmap_controls(struct kvm_vcpu *vcpu, return 0; } +static int nested_vmx_check_tpr_shadow_controls(struct kvm_vcpu *vcpu, + struct vmcs12 *vmcs12) +{ + if (!nested_cpu_has(vmcs12, CPU_BASED_TPR_SHADOW)) + return 0; + + if (!page_address_valid(vcpu, vmcs12->virtual_apic_page_addr)) + return -EINVAL; + + return 0; +} + /* * Merge L0's and L1's MSR bitmap, return false to indicate that * we do not use the hardware. @@ -10601,6 +10613,9 @@ static int check_vmentry_prereqs(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12) if (nested_vmx_check_msr_bitmap_controls(vcpu, vmcs12)) return VMXERR_ENTRY_INVALID_CONTROL_FIELD; + if (nested_vmx_check_tpr_shadow_controls(vcpu, vmcs12)) + return VMXERR_ENTRY_INVALID_CONTROL_FIELD; + if (nested_vmx_check_apicv_controls(vcpu, vmcs12)) return VMXERR_ENTRY_INVALID_CONTROL_FIELD;