Received: by 2002:a25:e74b:0:0:0:0:0 with SMTP id e72csp155067ybh; Tue, 14 Jul 2020 21:20:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy0o8EqEqHL3Ps9J+5NcipzCgfG8vSieJZmwfC9HDt53tad82NqBJJQImsLZIiQuapbJBgD X-Received: by 2002:a17:906:1d1b:: with SMTP id n27mr7745145ejh.272.1594786832773; Tue, 14 Jul 2020 21:20:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594786832; cv=none; d=google.com; s=arc-20160816; b=wPm8hT3AnabplrPlUbw3FGndc3Rtl59RIyi7+22Vl8+SE4HkKVj7lzKvv7reBDm89B FWdi20jfXM1zMel1FNkCSLuE+LTuzZZ2JQwAOTk5fPiWMOCrktw65XmFSd2PFczJTSqY K1Q6UxqN/5G3l0gecvZ2UrBBraylrDhtA9OSz84ARqDUgXflxODMvznuIi514KXASRPc j3IKPPpykf+BvVO1SchmSgg2BaDlwliHMBiUA9COaoA6NJ3Uf0VQ0ZTSkFJEieq+0OAy TPe9bdzGXNrkb/iGn4CmSDN+NjywOf0vPBBC1NUaCQyCefL/Zf0MIPmw7zg0UovkBeGi jZ5Q== 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=mVCw2/6v5YyVwh3X1p87gO2Lfbcp+/ZVIj9UnPYU8pg=; b=b1cgsrUzxD/uJ8R7pqmZud7FtEJjitLsMe6MjcSABgGYpsJ0CWMbb1IuJmNb+q0eJh wg+5xe6SBmkexUGcVlbJ+499aLhyeJKAeo0QKMBaoux0Ob90BoqAtOxWWW+dmM+MJsoa aKHfHl1QJ59hZvyxOA+VMaWLoqC8EWU9Gx1BIodRJB6qws7rRNFcj3xiIdKORHoxdYLd Pd0iCmZeip/qxB75oW1nurm5paE+cE8Or1tlP7nswVIwEz+LVvfESuLpdLB+mpS3Xk9l irs18IYLGEujQ60jBHl+hPsJmwGK1XXBZHtBFmth7rkxgpHINnLDcAjn4KS42ggF3vHZ BJFg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 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. [23.128.96.18]) by mx.google.com with ESMTP id b15si466321edt.394.2020.07.14.21.20.10; Tue, 14 Jul 2020 21:20:32 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 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 S1725991AbgGOEGD (ORCPT + 99 others); Wed, 15 Jul 2020 00:06:03 -0400 Received: from mga17.intel.com ([192.55.52.151]:16671 "EHLO mga17.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725885AbgGOEGC (ORCPT ); Wed, 15 Jul 2020 00:06:02 -0400 IronPort-SDR: MC6ZGUcmmoKsjmPMFKbNjeqSbb6NGalw6cS4L5lBvcv33d5p1K3kB5znCN8V5D7JUfZ0ekqhqI 0i3LeQJRYQ1w== X-IronPort-AV: E=McAfee;i="6000,8403,9682"; a="129167481" X-IronPort-AV: E=Sophos;i="5.75,353,1589266800"; d="scan'208";a="129167481" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Jul 2020 21:06:02 -0700 IronPort-SDR: v+XInTWoTKRYbE1UC1W2TSxWvGPUzRRM45ChY1gc2F5PTzO9jo7+fYkBfgQaKBFf63no4wBB6O O17oBdIpn/yw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,353,1589266800"; d="scan'208";a="485587009" Received: from sjchrist-coffee.jf.intel.com ([10.54.74.152]) by fmsmga006.fm.intel.com with ESMTP; 14 Jul 2020 21:06:01 -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, Dan Cross , Peter Shier Subject: [PATCH 2/7] KVM: nVMX: Reload vmcs01 if getting vmcs12's pages fails Date: Tue, 14 Jul 2020 21:05:52 -0700 Message-Id: <20200715040557.5889-3-sean.j.christopherson@intel.com> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200715040557.5889-1-sean.j.christopherson@intel.com> References: <20200715040557.5889-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 Reload vmcs01 when bailing from nested_vmx_enter_non_root_mode() as KVM expects vmcs01 to be loaded when is_guest_mode() is false. Fixes: 671ddc700fd08 ("KVM: nVMX: Don't leak L1 MMIO regions to L2") Cc: stable@vger.kernel.org Cc: Dan Cross Cc: Jim Mattson Cc: Peter Shier Signed-off-by: Sean Christopherson --- arch/x86/kvm/vmx/nested.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/x86/kvm/vmx/nested.c b/arch/x86/kvm/vmx/nested.c index 3b23901b90809..8cbf7bd3a7aa3 100644 --- a/arch/x86/kvm/vmx/nested.c +++ b/arch/x86/kvm/vmx/nested.c @@ -3345,8 +3345,10 @@ enum nvmx_vmentry_status nested_vmx_enter_non_root_mode(struct kvm_vcpu *vcpu, prepare_vmcs02_early(vmx, vmcs12); if (from_vmentry) { - if (unlikely(!nested_get_vmcs12_pages(vcpu))) + if (unlikely(!nested_get_vmcs12_pages(vcpu))) { + vmx_switch_vmcs(vcpu, &vmx->vmcs01); return NVMX_VMENTRY_KVM_INTERNAL_ERROR; + } if (nested_vmx_check_vmentry_hw(vcpu)) { vmx_switch_vmcs(vcpu, &vmx->vmcs01); -- 2.26.0