Patchwork powerpc: Fix memory leak in axon_msi.c

login
register
mail settings
Submitter Michael Ellerman
Date Oct. 13, 2009, 12:29 a.m.
Message ID <1255393780.9570.3.camel@concordia>
Download mbox | patch
Permalink /patch/35822/
State Accepted
Delegated to: Benjamin Herrenschmidt
Headers show

Comments

Michael Ellerman - Oct. 13, 2009, 12:29 a.m.
cppcheck found a memory leak in axon_msi, if dcr_base or dcr_len are zero,
we have already allocated msic, so we should free it in the error path.

Signed-off-by: Eric Sesterhenn <eric.sesterhenn@lsexperts.de>
Acked-by: Michael Ellerman <michael@ellerman.id.au>
Arnd Bergmann - Oct. 13, 2009, 1:30 p.m.
On Tuesday 13 October 2009, Michael Ellerman wrote:
> cppcheck found a memory leak in axon_msi, if dcr_base or dcr_len are zero,
> we have already allocated msic, so we should free it in the error path.
> 
> Signed-off-by: Eric Sesterhenn <eric.sesterhenn@lsexperts.de>
> Acked-by: Michael Ellerman <michael@ellerman.id.au>

Acked-by: Arnd Bergmann <arnd@arndb.de>

Patch

--- linux/arch/powerpc/platforms/cell/axon_msi.c.orig	2009-10-12 14:48:26.000000000 +0200
+++ linux/arch/powerpc/platforms/cell/axon_msi.c	2009-10-12 14:48:52.000000000 +0200
@@ -365,7 +365,7 @@  static int axon_msi_probe(struct of_devi
 		printk(KERN_ERR
 		       "axon_msi: couldn't parse dcr properties on %s\n",
 			dn->full_name);
-		goto out;
+		goto out_free_msic;
 	}

 	msic->dcr_host = dcr_map(dn, dcr_base, dcr_len);