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

Sam Ravnborg
2013-01-16T22:00:22Z

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@gmail.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