From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753525AbcIBNva (ORCPT ); Fri, 2 Sep 2016 09:51:30 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43274 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751982AbcIBNv2 (ORCPT ); Fri, 2 Sep 2016 09:51:28 -0400 Subject: Re: [PATCH 1/4] kvm: kvm_destroy_vm_debugfs(): check debugs_stat_data pointer To: Luiz Capitulino , kvm@vger.kernel.org References: <1472663145-1835-1-git-send-email-lcapitulino@redhat.com> <1472663145-1835-2-git-send-email-lcapitulino@redhat.com> Cc: linux-kernel@vger.kernel.org, rkrcmar@redhat.com, rostedt@goodmis.org, mhiramat@kernel.org, mtosatti@redhat.com From: Paolo Bonzini Message-ID: <677cf6bc-4f7b-f645-9b26-3bc315dc884c@redhat.com> Date: Fri, 2 Sep 2016 15:51:20 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.2.0 MIME-Version: 1.0 In-Reply-To: <1472663145-1835-2-git-send-email-lcapitulino@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Fri, 02 Sep 2016 13:51:27 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 > --- > 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