Patchwork [2/2] drivers/ata: introduce missing kfree

login
register
mail settings
Submitter Andrew Morton
Date Aug. 6, 2009, 11:05 p.m.
Message ID <200908062305.n76N59jW004244@imap1.linux-foundation.org>
Download mbox | patch
Permalink /patch/30897/
State Not Applicable
Delegated to: David Miller
Headers show

Comments

Andrew Morton - Aug. 6, 2009, 11:05 p.m.
From: Julia Lawall <julia@diku.dk>

Error handling code following a kzalloc should free the allocated data.

The semantic match that finds the problem is as follows:
(http://www.emn.fr/x-info/coccinelle/)

// <smpl>
@r exists@
local idexpression x;
statement S;
expression E;
identifier f,f1,l;
position p1,p2;
expression *ptr != NULL;
@@

x@p1 = \(kmalloc\|kzalloc\|kcalloc\)(...);
...
if (x == NULL) S
<... when != x
     when != if (...) { <+...x...+> }
(
x->f1 = E
|
 (x->f1 == NULL || ...)
|
 f(...,x->f1,...)
)
...>
(
 return \(0\|<+...x...+>\|ptr\);
|
 return@p2 ...;
)

@script:python@
p1 << r.p1;
p2 << r.p2;
@@

print "* file: %s kmalloc %s return %s" % (p1[0].file,p1[0].line,p2[0].line)
// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>
Cc: Jeff Garzik <jeff@garzik.org>
Cc: Tejun Heo <tj@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/ata/pata_at91.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Patch

diff -puN drivers/ata/pata_at91.c~drivers-ata-introduce-missing-kfree drivers/ata/pata_at91.c
--- a/drivers/ata/pata_at91.c~drivers-ata-introduce-missing-kfree
+++ a/drivers/ata/pata_at91.c
@@ -261,7 +261,8 @@  static int __devinit pata_at91_probe(str
 
 	if (IS_ERR(info->mck)) {
 		dev_err(dev, "failed to get access to mck clock\n");
-		return -ENODEV;
+		ret = -ENODEV;
+		goto err_clk_get;
 	}
 
 	info->cs    = board->chipselect;
@@ -308,6 +309,7 @@  err_alt_ioremap:
 
 err_ide_ioremap:
 	clk_put(info->mck);
+err_clk_get:
 	kfree(info);
 
 	return ret;