linux-kernel - Re: [PATCH] sparc: kernel/sbus.c: fix memory leakage

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20130116220018.GA14063@merkur.ravnborg.org>
Date:	Wed, 16 Jan 2013 23:00:18 +0100
From:	Sam Ravnborg <sam@...nborg.org>
To:	Cong Ding <dinggnu@...il.com>
Cc:	"David S. Miller" <davem@...emloft.net>,
	sparclinux@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH] sparc: kernel/sbus.c: fix memory leakage

On Wed, Jan 16, 2013 at 10:17:26PM +0100, Cong Ding wrote:
> On Wed, Jan 16, 2013 at 10:13:09PM +0100, Sam Ravnborg wrote:
> > On Mon, Jan 14, 2013 at 10:36:08PM +0100, Cong Ding wrote:
> > > the variable iommu and strbuf are not freed if it goes to error.
> > > 
> > > Signed-off-by: Cong Ding <dinggnu@...il.com>
> > > ---
> > >  arch/sparc/kernel/sbus.c |    8 ++++++--
> > >  1 file changed, 6 insertions(+), 2 deletions(-)
> > > 
> > > diff --git a/arch/sparc/kernel/sbus.c b/arch/sparc/kernel/sbus.c
> > > index 1271b3a..0b66e53 100644
> > > --- a/arch/sparc/kernel/sbus.c
> > > +++ b/arch/sparc/kernel/sbus.c
> > > @@ -555,10 +555,10 @@ static void __init sbus_iommu_init(struct platform_device *op)
> > >  
> > >  	iommu = kzalloc(sizeof(*iommu), GFP_ATOMIC);
> > >  	if (!iommu)
> > > -		goto fatal_memory_error;
> > > +		goto fatal_iommu_memory_error;
> > >  	strbuf = kzalloc(sizeof(*strbuf), GFP_ATOMIC);
> > >  	if (!strbuf)
> > > -		goto fatal_memory_error;
> > > +		goto fatal_strbuf_memory_error;
> > >  
> > >  	op->dev.archdata.iommu = iommu;
> > >  	op->dev.archdata.stc = strbuf;
> > > @@ -656,6 +656,10 @@ static void __init sbus_iommu_init(struct platform_device *op)
> > >  	return;
> > >  
> > >  fatal_memory_error:
> > > +	kfree(strbuf);
> > > +fatal_strbuf_memory_error:
> > > +	kfree(iommu);
> > > +fatal_iommu_memory_error:
> > >  	prom_printf("sbus_iommu_init: Fatal memory allocation error.\n");
> > >  }
> > kfree is a noop if passed a null pointer.
> > So you can just add the missing kfree's to fix this.
> > 
> > 	Sam
> as far as I know, most codes in the kernel are in the same style as this
> patch, but if you really prefer to do in the way you described I can send
> a new version.

I prefer the simpler variant.
Please redo.

	Sam
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/