lkml.org 
[lkml]   [2020]   [Oct]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.9 075/757] KVM: nVMX: Reload vmcs01 if getting vmcs12s pages fails
    Date
    From: Sean Christopherson <sean.j.christopherson@intel.com>

    commit b89d5ad00e789967a5e2c5335f75c48755bebd88 upstream.

    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 <dcross@google.com>
    Cc: Jim Mattson <jmattson@google.com>
    Cc: Peter Shier <pshier@google.com>
    Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
    Message-Id: <20200923184452.980-3-sean.j.christopherson@intel.com>
    Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    arch/x86/kvm/vmx/nested.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    --- a/arch/x86/kvm/vmx/nested.c
    +++ b/arch/x86/kvm/vmx/nested.c
    @@ -3346,8 +3346,10 @@ enum nvmx_vmentry_status nested_vmx_ente
    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);

    \
     
     \ /
      Last update: 2020-10-27 16:31    [W:4.130 / U:0.052 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site