Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp630726pxk; Wed, 23 Sep 2020 11:46:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz3VJDcks2KZyr05B3zU9whHrBXmhM1kj8BBBaQlOsEey2FAYJp2ThnaNQ/5Pu1mKDZyVsj X-Received: by 2002:a17:906:3494:: with SMTP id g20mr1009986ejb.486.1600886773962; Wed, 23 Sep 2020 11:46:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1600886773; cv=none; d=google.com; s=arc-20160816; b=NdXWWA3PFtbMVXtlkiFk+aLE4KSzSNTLhGp8ZrK68YLBJyfFMPrK6bv1VHsxr+zd7Q NO8IIuSFdhi87YckOM4jEjbWvNeHhRgY8jKDskkEyyhWZa8KNANfbAiMAkK7e1mlzMAD 47xrXw/QNWi9AeoU5rbkZCzYpVkZLJtkoPpgFJgHdDO4vAHpsrfqBlU0TnB8ZJ4cIzaM otKtCSPCJiR9Lb1rNEJdmkcPw/9LcOcrH+1XFEeqrMs96Ed65z7xDtGhgcz4y4NT2pGw sd5HJeJiS2mWiAxwbyqpBMVAloHlL4nhlHwg0VzzdqpXzKsmi0kuhWC8P4PrUmTTye+P RSBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :ironport-sdr:ironport-sdr; bh=9Pj7WoxFJQyMWbBx5ZjeYcgPInShdH5TzYpoQ3dFTtE=; b=IxBOeW5n9q4BwPKnjPuna/TfXXSKIyrHEYx6RziPSiRsU5iCiwLzMi9ta76ZnKmhx5 4sBJXLMJ/hscpCYIVNQX+NPCdJkEgrTan65UjcHzMFUxTWjZkIeLjvoML58cTje4lfqu FwxSd3nte2aes41xSY0HY4Au+qHVUUFRWrf3lxTzN+Ov5gluwwBAztg66ZtX/h8f5n+c Q9CBQ6JRVFgF6UAxTINv79NscC+FOeOkeAgeYPuLp4jf5xbEPPVuHvCJNmwlII/igeRs Z4WZpI+58+svSKtJxatUEtJ/+unm60YZl0dC4UxViyOestMbbci7fEqHpBfAfox4DGKR bqqg== 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 v11si480681ede.8.2020.09.23.11.45.50; Wed, 23 Sep 2020 11:46:13 -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 S1726939AbgIWSo5 (ORCPT + 99 others); Wed, 23 Sep 2020 14:44:57 -0400 Received: from mga07.intel.com ([134.134.136.100]:14506 "EHLO mga07.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726711AbgIWSoz (ORCPT ); Wed, 23 Sep 2020 14:44:55 -0400 IronPort-SDR: VbZQuuZ+uUK8e8z4f2nEeqHvBbaa25PHUsmaC2PkKNF3bmmKj3a4bH7GUJdhl6i3x3+KUuL+OZ fqRIWDeivXKA== X-IronPort-AV: E=McAfee;i="6000,8403,9753"; a="225124474" X-IronPort-AV: E=Sophos;i="5.77,293,1596524400"; d="scan'208";a="225124474" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Sep 2020 11:44:54 -0700 IronPort-SDR: LjcIMUL8xH72IKsmsKayxSISTkND3noBLIYVlSPe2Ub1AIz3Nb3RU+oymkMq3+G3HBqsvn8DxO 98ncN8HmVSZw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,293,1596524400"; d="scan'208";a="347457651" Received: from sjchrist-coffee.jf.intel.com ([10.54.74.160]) by FMSMGA003.fm.intel.com with ESMTP; 23 Sep 2020 11:44:53 -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 v2 2/7] KVM: nVMX: Reload vmcs01 if getting vmcs12's pages fails Date: Wed, 23 Sep 2020 11:44:47 -0700 Message-Id: <20200923184452.980-3-sean.j.christopherson@intel.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200923184452.980-1-sean.j.christopherson@intel.com> References: <20200923184452.980-1-sean.j.christopherson@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 04441663a631..171e34286908 100644 --- a/arch/x86/kvm/vmx/nested.c +++ b/arch/x86/kvm/vmx/nested.c @@ -3346,8 +3346,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.28.0