Received: by 2002:a25:6193:0:0:0:0:0 with SMTP id v141csp1158224ybb; Fri, 20 Mar 2020 14:33:26 -0700 (PDT) X-Google-Smtp-Source: ADFU+vt1+eDF7iFf9IUNqkC44ymfTc4cSk7u1Xdq/05tGxe9bjM/hmuHec2SOb58aXlcu/SiV+C7 X-Received: by 2002:aca:cc41:: with SMTP id c62mr8571724oig.58.1584740005975; Fri, 20 Mar 2020 14:33:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1584740005; cv=none; d=google.com; s=arc-20160816; b=CchBt5FE4Ya3W8SjGEMpDHlrPeKEQoNd/kNvpIda0mb7Ut2i61aAIr0bqTyvnQB+vR ++pTtxQQUKv8psG641XaN+zZfgjAoiXf6N8qbXFhDS/PfITHjDyvAe2zcjTCRjDxFKIs mrlx4q+xjD4lPmgKENCSCPeX+ZDJ8HqzE58TivNAuCACdf6AviI4y63MXE651jppuUza xV8eh8RczNUDxK4Zp6+uY+bgITPk+59ZOH8ZNcnaWwEPfINJtQJn32CgnxWkHBNST/kJ AC8uVhkYiAZkiJfA2juRIsuQKWuB7I/LWfyluS8yoeYofvLHubFmh7JEE37ga/Q2RnbZ Kjhw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :ironport-sdr:ironport-sdr; bh=zS7coIFLOHqy7S32lV2VmubcssB4TKQS63Ir6jkz1ks=; b=gADY4CARVquTL2J+AUA/XLCCSUyMf28ljCi9l1J8GjywhS6stBmhLQ6CD3mH1cTtaz hyM175hVgqZOOXaLt57WCaAtfofmF13PEKwPC7PqN9uJOFPddmMA9ssZYH4dHal35C+l hIFiWpulHervwNUAXJIu+wZfxKqPXeRxrMK8ZjBldwMl5KsLMgc36AwakLjjAZ63EGgs UWc24ehMvSAloPdha1uTi+8786U5OgzJYW67YosEwfm+t7bWxxFnXStyrobcoxzy0QG0 SJ73EjuJ0j5dIiqo0wx+EMR/mu9VgsU93Oyx7/NI8SO18f6AxuepVK0HMCkW3CEaiVap 3oww== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y52si3451095otb.191.2020.03.20.14.33.13; Fri, 20 Mar 2020 14:33:25 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727721AbgCTVbu (ORCPT + 99 others); Fri, 20 Mar 2020 17:31:50 -0400 Received: from mga01.intel.com ([192.55.52.88]:48422 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726666AbgCTV2o (ORCPT ); Fri, 20 Mar 2020 17:28:44 -0400 IronPort-SDR: 8ADoXOZBZ9sbKs5DrZ53e8xmwvRAfaVE9+vBdcWJs+7WucuRBXhIriCyugwWqT9+VgbB9kKSjT z3abJahqL+kw== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Mar 2020 14:28:43 -0700 IronPort-SDR: TLjnP7UgaLSYWQC6iMOaDZRwfWF0pQg2+dg1q+rDS+HFP24nOzh0ehXXVRz+6SK424CAMNtl34 AnVBwdr8GD6w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,286,1580803200"; d="scan'208";a="269224397" Received: from sjchrist-coffee.jf.intel.com ([10.54.74.202]) by fmsmga004.fm.intel.com with ESMTP; 20 Mar 2020 14:28:43 -0700 From: Sean Christopherson To: Paolo Bonzini Cc: Sean Christopherson , Vitaly Kuznetsov , Wanpeng Li , Jim Mattson , Joerg Roedel , kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Ben Gardon , Junaid Shahid , Liran Alon , Boris Ostrovsky , John Haxby , Miaohe Lin , Tom Lendacky Subject: [PATCH v3 02/37] KVM: nVMX: Validate the EPTP when emulating INVEPT(EXTENT_CONTEXT) Date: Fri, 20 Mar 2020 14:27:58 -0700 Message-Id: <20200320212833.3507-3-sean.j.christopherson@intel.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200320212833.3507-1-sean.j.christopherson@intel.com> References: <20200320212833.3507-1-sean.j.christopherson@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signal VM-Fail for the single-context variant of INVEPT if the specified EPTP is invalid. Per the INEVPT pseudocode in Intel's SDM, it's subject to the standard EPT checks: If VM entry with the "enable EPT" VM execution control set to 1 would fail due to the EPTP value then VMfail(Invalid operand to INVEPT/INVVPID); Fixes: bfd0a56b90005 ("nEPT: Nested INVEPT") Signed-off-by: Sean Christopherson --- arch/x86/kvm/vmx/nested.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/x86/kvm/vmx/nested.c b/arch/x86/kvm/vmx/nested.c index 8578513907d7..f3774cef4fd4 100644 --- a/arch/x86/kvm/vmx/nested.c +++ b/arch/x86/kvm/vmx/nested.c @@ -5156,8 +5156,12 @@ static int handle_invept(struct kvm_vcpu *vcpu) } switch (type) { - case VMX_EPT_EXTENT_GLOBAL: case VMX_EPT_EXTENT_CONTEXT: + if (!nested_vmx_check_eptp(vcpu, operand.eptp)) + return nested_vmx_failValid(vcpu, + VMXERR_INVALID_OPERAND_TO_INVEPT_INVVPID); + fallthrough; + case VMX_EPT_EXTENT_GLOBAL: /* * TODO: Sync the necessary shadow EPT roots here, rather than * at the next emulated VM-entry. -- 2.24.1