summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2016-11-30 22:21:05 +0300
committerRadim Krčmář <rkrcmar@redhat.com>2016-12-01 16:10:50 +0100
commita0f1d21c1ccb1da66629627a74059dd7f5ac9c61 (patch)
tree50974c8b8a1564bd35353043f3202510f7cec4de
parent0f4828a1da3342be81e812b28fbcf29261146d25 (diff)
downloadlinux-stable-a0f1d21c1ccb1da66629627a74059dd7f5ac9c61.tar.gz
linux-stable-a0f1d21c1ccb1da66629627a74059dd7f5ac9c61.tar.bz2
linux-stable-a0f1d21c1ccb1da66629627a74059dd7f5ac9c61.zip
KVM: use after free in kvm_ioctl_create_device()
We should move the ops->destroy(dev) after the list_del(&dev->vm_node) so that we don't use "dev" after freeing it. Fixes: a28ebea2adc4 ("KVM: Protect device ops->create and list_add with kvm->lock") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Reviewed-by: David Hildenbrand <david@redhat.com> Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
-rw-r--r--virt/kvm/kvm_main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 5c360347a1e9..7f9ee2929cfe 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -2889,10 +2889,10 @@ static int kvm_ioctl_create_device(struct kvm *kvm,
ret = anon_inode_getfd(ops->name, &kvm_device_fops, dev, O_RDWR | O_CLOEXEC);
if (ret < 0) {
- ops->destroy(dev);
mutex_lock(&kvm->lock);
list_del(&dev->vm_node);
mutex_unlock(&kvm->lock);
+ ops->destroy(dev);
return ret;
}