summaryrefslogtreecommitdiffstats
path: root/virt/kvm
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2016-07-14 18:49:52 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2016-07-14 19:11:21 +0200
commit7964218c7d8fe36a79a5e02312b1f3a16a17ee68 (patch)
tree8fead675d92c2fbdc180db2231fd47e6ff067984 /virt/kvm
parent2be5b3f6dc84d30810cc0a94fa66205c27cf5f42 (diff)
downloadlinux-stable-7964218c7d8fe36a79a5e02312b1f3a16a17ee68.tar.gz
linux-stable-7964218c7d8fe36a79a5e02312b1f3a16a17ee68.tar.bz2
linux-stable-7964218c7d8fe36a79a5e02312b1f3a16a17ee68.zip
Revert "KVM: release anon file in failure path of vm creation"
This reverts commit 77ecc085fed1af1000ca719522977b960aa6da52. Al Viro colorfully says: "You should *NEVER* use sys_close() on failure exit paths like that. Moreover, this kvm_put_kvm() becomes a double-put, since closing the damn file will drop that reference to kvm. Please, revert. anon_inode_getfd() should be used only when there's no possible failures past its call". Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'virt/kvm')
-rw-r--r--virt/kvm/kvm_main.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index cc182d9760ed..dd25346ec356 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -49,7 +49,6 @@
#include <linux/slab.h>
#include <linux/sort.h>
#include <linux/bsearch.h>
-#include <linux/syscalls.h>
#include <asm/processor.h>
#include <asm/io.h>
@@ -3070,7 +3069,6 @@ static int kvm_dev_ioctl_create_vm(unsigned long type)
if (kvm_create_vm_debugfs(kvm, r) < 0) {
kvm_put_kvm(kvm);
- sys_close(r);
return -ENOMEM;
}