2011-04-01 14:23:43

by Julia Lawall

[permalink] [raw]
Subject: [PATCH 2/6] drivers/crypto/caam/caamalg.c: introduce missing kfree

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

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

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

[email protected] = \(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\);
|
[email protected] ...;
)

@script:[email protected]
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 <[email protected]>

---
drivers/crypto/caam/caamalg.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/drivers/crypto/caam/caamalg.c b/drivers/crypto/caam/caamalg.c
index dce44b2..20e1215 100644
--- a/drivers/crypto/caam/caamalg.c
+++ b/drivers/crypto/caam/caamalg.c
@@ -1120,6 +1120,7 @@ static int __init caam_algapi_init(void)
if (err < 0 && i == 0) {
dev_err(ctrldev, "algapi error in job ring registration: %d\n",
err);
+ kfree(jrdev);
return err;
}



2011-04-01 19:43:18

by Kim Phillips

[permalink] [raw]
Subject: Re: [PATCH 2/6] drivers/crypto/caam/caamalg.c: introduce missing kfree

On Fri, 1 Apr 2011 16:23:43 +0200
Julia Lawall <[email protected]> wrote:

> Error handling code following a kmalloc should free the allocated data.

> Signed-off-by: Julia Lawall <[email protected]>
> ---

Acked-by: Kim Phillips <[email protected]>

Kim

2011-04-08 12:41:28

by Herbert Xu

[permalink] [raw]
Subject: Re: [PATCH 2/6] drivers/crypto/caam/caamalg.c: introduce missing kfree

On Fri, Apr 01, 2011 at 02:42:05PM -0500, Kim Phillips wrote:
> On Fri, 1 Apr 2011 16:23:43 +0200
> Julia Lawall <[email protected]> wrote:
>
> > Error handling code following a kmalloc should free the allocated data.
>
> > Signed-off-by: Julia Lawall <[email protected]>
> > ---
>
> Acked-by: Kim Phillips <[email protected]>

Patch applied. Thanks!
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt