| Message ID | 1472663145-1835-2-git-send-email-lcapitulino@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 31/08/2016 19:05, Luiz Capitulino wrote: > 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) > Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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)
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(-)