Patchwork [2/8] drivers/rtc: introduce missing kfree

login
register
mail settings
Submitter Julia Lawall
Date Nov. 21, 2009, 11:50 a.m.
Message ID <Pine.LNX.4.64.0911211249420.23681@ask.diku.dk>
Download mbox | patch
Permalink /patch/38981/
State Awaiting Upstream
Headers show

Comments

Julia Lawall - Nov. 21, 2009, 11:50 a.m.
From: Julia Lawall <julia@diku.dk>

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@diku.dk>
---
 drivers/rtc/rtc-mxc.c               |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
Alessandro Zummo - Nov. 22, 2009, 8:42 p.m.
On Sat, 21 Nov 2009 12:50:08 +0100 (CET)
Julia Lawall <julia@diku.dk> wrote:

> Signed-off-by: Julia Lawall <julia@diku.dk>

 Acked-by: Alessandro Zummo <a.zummo@towertech.it>

Patch

diff --git a/drivers/rtc/rtc-mxc.c b/drivers/rtc/rtc-mxc.c
index 6bd5072..2642e6b 100644
--- a/drivers/rtc/rtc-mxc.c
+++ b/drivers/rtc/rtc-mxc.c
@@ -396,8 +396,10 @@  static int __init mxc_rtc_probe(struct platform_device *pdev)
 	pdata->ioaddr = ioremap(res->start, resource_size(res));
 
 	clk = clk_get(&pdev->dev, "ckil");
-	if (IS_ERR(clk))
-		return PTR_ERR(clk);
+	if (IS_ERR(clk)) {
+		ret = PTR_ERR(clk);
+		goto exit_free_pdata;
+	}
 
 	rate = clk_get_rate(clk);
 	clk_put(clk);