Patchwork [9/10] drivers/ata: introduce missing kfree

login
register
mail settings
Submitter Julia Lawall
Date Aug. 1, 2009, 8:55 a.m.
Message ID <Pine.LNX.4.64.0908011055050.23408@ask.diku.dk>
Download mbox | patch
Permalink /patch/30450/
State Not Applicable
Delegated to: David Miller
Headers show

Comments

Julia Lawall - Aug. 1, 2009, 8:55 a.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>
---
 drivers/ata/pata_at91.c             |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

--
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Tejun Heo - Aug. 4, 2009, 4:49 a.m.
Julia Lawall wrote:
...
> ---
>  drivers/ata/pata_at91.c             |    4 +++-
>  1 files changed, 3 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/ata/pata_at91.c b/drivers/ata/pata_at91.c
> index 5702aff..46fb883 100644
> --- a/drivers/ata/pata_at91.c
> +++ b/drivers/ata/pata_at91.c
> @@ -261,7 +261,8 @@ static int __devinit pata_at91_probe(struct platform_device *pdev)
>  
>  	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);

cc'ing Matyukevich Sergey.  Matyukevich, is it possible to use
devm_kzalloc() instead?

Thanks.
Sergey Matyukevich - Aug. 15, 2009, 7:15 a.m.
Hi,

> cc'ing Matyukevich Sergey.  Matyukevich, is it possible to use
> devm_kzalloc() instead?

Many thanks for review and fixes. 
Your final patch with devm_kzalloc is just fine.

Sergey
--
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/ata/pata_at91.c b/drivers/ata/pata_at91.c
index 5702aff..46fb883 100644
--- a/drivers/ata/pata_at91.c
+++ b/drivers/ata/pata_at91.c
@@ -261,7 +261,8 @@  static int __devinit pata_at91_probe(struct platform_device *pdev)
 
 	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;