Skip to contentSkip to conversation

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

PATCH In review Jann Horn 4 participants 5 messages Feb 18, 2019 – Feb 21, 2019 Stable branch

lore
Share & tools
lore

Jann Horn

author
#0 lore raw

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

commit cfa39381173d5f969daf43582c95ad679189cbc9 upstream.

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 852b6d57dc7f ("kvm: add device control API")
---
 virt/kvm/kvm_main.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
virt/kvm/kvm_main.c +2 -1
index e4be695eb789..fce48d11ae07 100644
@@ -2711,14 +2711,15 @@ static int kvm_ioctl_create_device(struct kvm *kvm,
 		return ret;
 	}
 
+	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);
 		ops->destroy(dev);
 		return ret;
 	}
 
 	list_add(&dev->vm_node, &kvm->devices);
-	kvm_get_kvm(kvm);
 	cd->fd = ret;
 	return 0;
 }
Signature · 1 line
2.21.0.rc0.258.g878e2cd30e-goog
maintainer
#1 lore raw

Re: [PATCH 3.18,4.4] kvm: fix kvm_ioctl_create_device() reference counting (CVE-2019-6974)g

Quoted 16 lines · Jann Horn

commit cfa39381173d5f969daf43582c95ad679189cbc9 upstream.

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.

Quoted 6 lines

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 852b6d57dc7f ("kvm: add device control API")

Hi Jann,

You've dropped Paolo's S-O-B line, was it on purpose?

--
Thanks,
Sasha

author
#2 lore raw

Re: [PATCH 3.18,4.4] kvm: fix kvm_ioctl_create_device() reference counting (CVE-2019-6974)g

Quoted 21 lines · Sasha Levin
Quoted 19 lines · Jann Horn

commit cfa39381173d5f969daf43582c95ad679189cbc9 upstream.

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.

Quoted 7 lines
Quoted 3 lines
Fixes 852b6d57dc7f ("kvm: add device control API")

Hi Jann,

You've dropped Paolo's S-O-B line, was it on purpose?

The stable kernel rules don't explicitly say that I'm allowed to keep other people's sign-off lines when manually submitting backports, so I removed it to be on the safe side.

#3 lore raw

Re: [PATCH 3.18,4.4] kvm: fix kvm_ioctl_create_device() reference counting (CVE-2019-6974)g

Quoted 8 lines · Jann Horn
Quoted 3 lines · Sasha Levin

Hi Jann,

You've dropped Paolo's S-O-B line, was it on purpose?

The stable kernel rules don't explicitly say that I'm allowed to keep other people's sign-off lines when manually submitting backports, so I removed it to be on the safe side.

Yeah, since I wasn't really involved in the creation of this patch, and I had not modified Jann's original submission in any way, I guess it's okay either way.

Paolo

#4 lore raw
In reply to Jann Horn
Quoted 19 lines · Jann Horn

commit cfa39381173d5f969daf43582c95ad679189cbc9 upstream.

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.

Quoted 6 lines
Fixes 852b6d57dc7f ("kvm: add device control API")
---
 virt/kvm/kvm_main.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Now queued up, thanks.

greg k-h