Commit cfa39381 authored Jan 26, 2019 by Jann Horn Committed by Paolo Bonzini Feb 07, 2019

kvm: fix kvm_ioctl_create_device() reference counting (CVE-2019-6974)



kvm_ioctl_create_device() does the following:

1. creates a device that holds a reference to the VM object (with a borrowed
   reference, the VM's refcount has not been bumped yet)
2. initializes the device
3. transfers the reference to the device to the caller's file descriptor table
4. calls kvm_get_kvm() to turn the borrowed reference to the VM into a real
   reference

The ownership transfer in step 3 must not happen before the reference to the VM
becomes a proper, non-borrowed reference, which only happens in step 4.
After step 3, an attacker can close the file descriptor and drop the borrowed
reference, which can cause the refcount of the kvm object to drop to zero.

This means that we need to grab a reference for the device before
anon_inode_getfd(), otherwise the VM can disappear from under us.

Fixes: 852b6d57 ("kvm: add device control API")
Cc: stable@kernel.org
Signed-off-by: Jann Horn <jannh@google.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

parent 8834f560

virt/kvm/kvm_main.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -3000,8 +3000,10 @@ static int kvm_ioctl_create_device(struct kvm *kvm,
		if (ops->init)
		ops->init(dev);

		kvm_get_kvm(kvm);
		ret = anon_inode_getfd(ops->name, &kvm_device_fops, dev, O_RDWR \| O_CLOEXEC);
		if (ret < 0) {
		kvm_put_kvm(kvm);
		mutex_lock(&kvm->lock);
		list_del(&dev->vm_node);
		mutex_unlock(&kvm->lock);
		@@ -3009,7 +3011,6 @@ static int kvm_ioctl_create_device(struct kvm *kvm,
		return ret;
		}

		kvm_get_kvm(kvm);
		cd->fd = ret;
		return 0;
		}

Admin message