Skip to content

Commit

Permalink
KVM: VMX: Unregister posted interrupt wakeup handler on hardware unsetup
Browse files Browse the repository at this point in the history
Unregister KVM's posted interrupt wakeup handler during unsetup so that a
spurious interrupt that arrives after kvm_intel.ko is unloaded doesn't
call into freed memory.

Fixes: bf9f6ac ("KVM: Update Posted-Interrupts Descriptor when vCPU is blocked")
Cc: stable@vger.kernel.org
Signed-off-by: Sean Christopherson <seanjc@google.com>
Message-Id: <20211009001107.3936588-3-seanjc@google.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
  • Loading branch information
sean-jc authored and bonzini committed Oct 22, 2021
1 parent 6ff53f6 commit ec5a491
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions arch/x86/kvm/vmx/vmx.c
Original file line number Diff line number Diff line change
Expand Up @@ -7555,6 +7555,8 @@ static void vmx_migrate_timers(struct kvm_vcpu *vcpu)

static void hardware_unsetup(void)
{
kvm_set_posted_intr_wakeup_handler(NULL);

if (nested)
nested_vmx_hardware_unsetup();

Expand Down Expand Up @@ -7885,8 +7887,6 @@ static __init int hardware_setup(void)
vmx_x86_ops.request_immediate_exit = __kvm_request_immediate_exit;
}

kvm_set_posted_intr_wakeup_handler(pi_wakeup_handler);

kvm_mce_cap_supported |= MCG_LMCE_P;

if (pt_mode != PT_MODE_SYSTEM && pt_mode != PT_MODE_HOST_GUEST)
Expand All @@ -7910,6 +7910,9 @@ static __init int hardware_setup(void)
r = alloc_kvm_area();
if (r)
nested_vmx_hardware_unsetup();

kvm_set_posted_intr_wakeup_handler(pi_wakeup_handler);

return r;
}

Expand Down

0 comments on commit ec5a491

Please sign in to comment.