[PATCH 1/4] kvm: kvm_destroy_vm_debugfs(): check debugs_stat_data pointer

From	Luiz Capitulino <lcapitulino@redhat.com>
Newsgroups	linux.kernel
Subject	[PATCH 1/4] kvm: kvm_destroy_vm_debugfs(): check debugs_stat_data pointer
Date	2016-08-31 19:10 +0200
Message-ID	<schbr-59T-3@gated-at.bofh.it> (permalink)
References	<schbr-59T-5@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

This make it possible to call kvm_destroy_vm_debugfs() from
kvm_create_vm_debugfs() in error conditions.

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
 virt/kvm/kvm_main.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 1950782..c1dc45e 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -559,9 +559,11 @@ static void kvm_destroy_vm_debugfs(struct kvm *kvm)
 
 	debugfs_remove_recursive(kvm->debugfs_dentry);
 
-	for (i = 0; i < kvm_debugfs_num_entries; i++)
-		kfree(kvm->debugfs_stat_data[i]);
-	kfree(kvm->debugfs_stat_data);
+	if (kvm->debugfs_stat_data) {
+		for (i = 0; i < kvm_debugfs_num_entries; i++)
+			kfree(kvm->debugfs_stat_data[i]);
+		kfree(kvm->debugfs_stat_data);
+	}
 }
 
 static int kvm_create_vm_debugfs(struct kvm *kvm, int fd)
-- 
2.5.5

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

Thread

[PATCH 1/4] kvm: kvm_destroy_vm_debugfs(): check debugs_stat_data pointer Luiz Capitulino <lcapitulino@redhat.com> - 2016-08-31 19:10 +0200
  Re: [PATCH 1/4] kvm: kvm_destroy_vm_debugfs(): check debugs_stat_data  pointer Paolo Bonzini <pbonzini@redhat.com> - 2016-09-02 16:00 +0200

csiph-web