[PATCH 7/8] drivers/dma: introduce missing kfree

From: Julia Lawall
Date: Sat Nov 21 2009 - 06:52:51 EST


From: Julia Lawall <julia@xxxxxxx>

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

The semantic match that finds this 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@xxxxxxx>
---
drivers/dma/shdma.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/drivers/dma/shdma.c b/drivers/dma/shdma.c
index b3b065c..0cd0d58 100644
--- a/drivers/dma/shdma.c
+++ b/drivers/dma/shdma.c
@@ -649,7 +649,7 @@ static int __init sh_dmae_probe(struct platform_device *pdev)

/* get platform data */
if (!pdev->dev.platform_data)
- goto shdev_err;
+ goto platform_err;

/* platform data */
memcpy(&shdev->pdata, pdev->dev.platform_data,
@@ -720,6 +720,7 @@ eirq_err:
free_irq(eirq[ecnt], shdev);

rst_err:
+platform_err:
kfree(shdev);

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