From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965366AbcHaRFw (ORCPT ); Wed, 31 Aug 2016 13:05:52 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51656 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964922AbcHaRFu (ORCPT ); Wed, 31 Aug 2016 13:05:50 -0400 From: Luiz Capitulino To: kvm@vger.kernel.org Cc: linux-kernel@vger.kernel.org, pbonzini@redhat.com, rkrcmar@redhat.com, rostedt@goodmis.org, mhiramat@kernel.org, mtosatti@redhat.com Subject: [PATCH 2/4] kvm: kvm_create_vm_debugfs(): cleanup on error Date: Wed, 31 Aug 2016 13:05:43 -0400 Message-Id: <1472663145-1835-3-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1472663145-1835-1-git-send-email-lcapitulino@redhat.com> References: <1472663145-1835-1-git-send-email-lcapitulino@redhat.com> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Wed, 31 Aug 2016 17:05:49 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Memory and debugfs entries are leaked on error. Fix it. Signed-off-by: Luiz Capitulino --- virt/kvm/kvm_main.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index c1dc45e..9293285 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -585,12 +585,12 @@ static int kvm_create_vm_debugfs(struct kvm *kvm, int fd) sizeof(*kvm->debugfs_stat_data), GFP_KERNEL); if (!kvm->debugfs_stat_data) - return -ENOMEM; + goto out_err; for (p = debugfs_entries; p->name; p++) { stat_data = kzalloc(sizeof(*stat_data), GFP_KERNEL); if (!stat_data) - return -ENOMEM; + goto out_err; stat_data->kvm = kvm; stat_data->offset = p->offset; @@ -599,9 +599,13 @@ static int kvm_create_vm_debugfs(struct kvm *kvm, int fd) kvm->debugfs_dentry, stat_data, stat_fops_per_vm[p->kind])) - return -ENOMEM; + goto out_err; } return 0; + +out_err: + kvm_destroy_vm_debugfs(kvm); + return -ENOMEM; } static struct kvm *kvm_create_vm(unsigned long type) -- 2.5.5