[PATCH] KVM: explain missing kvm_put_kvm in case of failure

From	Paolo Bonzini <pbonzini@redhat.com>
Newsgroups	linux.kernel
Subject	[PATCH] KVM: explain missing kvm_put_kvm in case of failure
Date	2017-06-27 15:50 +0200
Message-ID	<tWZ2q-1ch-19@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

The call to kvm_put_kvm was removed from error handling in commit
506cfba9e726 ("KVM: don't use anon_inode_getfd() before possible
failures"), but it is _not_ a memory leak.  Reuse Al's explanation
to avoid that someone else makes the same mistake.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 virt/kvm/kvm_main.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 3863cf7ae1a3..19f0ecb9b93e 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -3191,6 +3191,12 @@ static int kvm_dev_ioctl_create_vm(unsigned long type)
 		return PTR_ERR(file);
 	}
 
+	/*
+	 * Don't call kvm_put_kvm anymore at this point; file->f_op is
+	 * already set, with ->release() being kvm_vm_release().  In error
+	 * cases it will be called by the final fput(file) and will take
+	 * care of doing kvm_put_kvm(kvm).
+	 */
 	if (kvm_create_vm_debugfs(kvm, r) < 0) {
 		put_unused_fd(r);
 		fput(file);
-- 
1.8.3.1

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH] KVM: explain missing kvm_put_kvm in case of failure Paolo Bonzini <pbonzini@redhat.com> - 2017-06-27 15:50 +0200

csiph-web