Revert "KVM: release anon file in failure path of vm creation"
authorPaolo Bonzini <pbonzini@redhat.com>
Thu, 14 Jul 2016 16:49:52 +0000 (18:49 +0200)
committerPaolo Bonzini <pbonzini@redhat.com>
Thu, 14 Jul 2016 17:11:21 +0000 (19:11 +0200)
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>
virt/kvm/kvm_main.c

index cc182d9760edcce62ac3f15a176015122b35753e..dd25346ec356b53308bf99ca140f2996b8c5a85b 100644 (file)
@@ -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;
        }