From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753876Ab3AUWUs (ORCPT ); Mon, 21 Jan 2013 17:20:48 -0500 Received: from racecourse.oldelvet.net ([93.93.128.81]:49919 "EHLO racecourse.oldelvet.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752376Ab3AUWUq (ORCPT ); Mon, 21 Jan 2013 17:20:46 -0500 Message-ID: <50FDBF34.4020409@oldelvet.org.uk> Date: Mon, 21 Jan 2013 22:20:36 +0000 From: Richard Mortimer User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:17.0) Gecko/17.0 Thunderbird/17.0 MIME-Version: 1.0 To: Cong Ding CC: Sam Ravnborg , "David S. Miller" , sparclinux@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v3] sparc: kernel/sbus.c: fix memory leakage References: <1358199372-11976-1-git-send-email-dinggnu@gmail.com> <20130116211309.GA13993@merkur.ravnborg.org> <20130116211725.GC18593@gmail.com> <20130116220018.GA14063@merkur.ravnborg.org> <20130116220153.GD18593@gmail.com> <50F7D577.8010506@oldelvet.org.uk> <20130117115637.GB25615@gmail.com> <50F7EED3.1050309@oldelvet.org.uk> <20130117132843.GD25615@gmail.com> In-Reply-To: <20130117132843.GD25615@gmail.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Reviewed-by: Richard Mortimer On 17/01/2013 13:28, Cong Ding wrote: > The variable iommu and strbuf are not freed properly if it goes to error. > > Signed-off-by: Cong Ding > --- > arch/sparc/kernel/sbus.c | 6 +++--- > 1 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/arch/sparc/kernel/sbus.c b/arch/sparc/kernel/sbus.c > index 1271b3a..be5bdf9 100644 > --- a/arch/sparc/kernel/sbus.c > +++ b/arch/sparc/kernel/sbus.c > @@ -554,10 +554,8 @@ static void __init sbus_iommu_init(struct platform_device *op) > regs = pr->phys_addr; > > iommu = kzalloc(sizeof(*iommu), GFP_ATOMIC); > - if (!iommu) > - goto fatal_memory_error; > strbuf = kzalloc(sizeof(*strbuf), GFP_ATOMIC); > - if (!strbuf) > + if (!iommu || !strbuf) > goto fatal_memory_error; > > op->dev.archdata.iommu = iommu; > @@ -656,6 +654,8 @@ static void __init sbus_iommu_init(struct platform_device *op) > return; > > fatal_memory_error: > + kfree(iommu); > + kfree(strbuf); > prom_printf("sbus_iommu_init: Fatal memory allocation error.\n"); > } > >