Skip to content

Commit e8bc242

Browse files
aikbonzini
authored andcommitted
KVM: Don't null dereference ops->destroy
A KVM device cleanup happens in either of two callbacks: 1) destroy() which is called when the VM is being destroyed; 2) release() which is called when a device fd is closed. Most KVM devices use 1) but Book3s's interrupt controller KVM devices (XICS, XIVE, XIVE-native) use 2) as they need to close and reopen during the machine execution. The error handling in kvm_ioctl_create_device() assumes destroy() is always defined which leads to NULL dereference as discovered by Syzkaller. This adds a checks for destroy!=NULL and adds a missing release(). This is not changing kvm_destroy_devices() as devices with defined release() should have been removed from the KVM devices list by then. Suggested-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
1 parent ffd1925 commit e8bc242

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

virt/kvm/kvm_main.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4300,8 +4300,11 @@ static int kvm_ioctl_create_device(struct kvm *kvm,
43004300
kvm_put_kvm_no_destroy(kvm);
43014301
mutex_lock(&kvm->lock);
43024302
list_del(&dev->vm_node);
4303+
if (ops->release)
4304+
ops->release(dev);
43034305
mutex_unlock(&kvm->lock);
4304-
ops->destroy(dev);
4306+
if (ops->destroy)
4307+
ops->destroy(dev);
43054308
return ret;
43064309
}
43074310

0 commit comments

Comments
 (0)