]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
KVM: Assert that a destroyed/freed vCPU is no longer visible
authorSean Christopherson <seanjc@google.com>
Mon, 24 Feb 2025 23:55:38 +0000 (15:55 -0800)
committerPaolo Bonzini <pbonzini@redhat.com>
Wed, 26 Feb 2025 18:17:23 +0000 (13:17 -0500)
After freeing a vCPU, assert that it is no longer reachable, and that
kvm_get_vcpu() doesn't return garbage or a pointer to some other vCPU.
While KVM obviously shouldn't be attempting to access a freed vCPU, it's
all too easy for KVM to make a VM-wide request, e.g. via KVM_BUG_ON() or
kvm_flush_remote_tlbs().

Alternatively, KVM could short-circuit problematic paths if the VM's
refcount has gone to zero, e.g. in kvm_make_all_cpus_request(), or KVM
could try disallow making global requests during teardown.  But given that
deleting the vCPU from the array Just Works, adding logic to the requests
path is unnecessary, and trying to make requests illegal during teardown
would be a fool's errand.

Signed-off-by: Sean Christopherson <seanjc@google.com>
Message-ID: <20250224235542.2562848-4-seanjc@google.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
virt/kvm/kvm_main.c

index ba0327e2d0d3336c680be6543289b88ff22540e8..28ba54b8742555b86f876906520811bcfb0ac9a1 100644 (file)
@@ -489,6 +489,14 @@ void kvm_destroy_vcpus(struct kvm *kvm)
        kvm_for_each_vcpu(i, vcpu, kvm) {
                kvm_vcpu_destroy(vcpu);
                xa_erase(&kvm->vcpu_array, i);
+
+               /*
+                * Assert that the vCPU isn't visible in any way, to ensure KVM
+                * doesn't trigger a use-after-free if destroying vCPUs results
+                * in VM-wide request, e.g. to flush remote TLBs when tearing
+                * down MMUs, or to mark the VM dead if a KVM_BUG_ON() fires.
+                */
+               WARN_ON_ONCE(xa_load(&kvm->vcpu_array, i) || kvm_get_vcpu(kvm, i));
        }
 
        atomic_set(&kvm->online_vcpus, 0);