public inbox for kernel-janitors@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH 2/6] drivers/crypto/caam/caamalg.c: introduce missing kfree
@ 2011-04-01 14:23 Julia Lawall
  2011-04-01 19:42 ` [PATCH 2/6] drivers/crypto/caam/caamalg.c: introduce missing Kim Phillips
  0 siblings, 1 reply; 3+ messages in thread
From: Julia Lawall @ 2011-04-01 14:23 UTC (permalink / raw)
  To: Herbert Xu
  Cc: kernel-janitors, David S. Miller, Kim Phillips, Steve Cornelius,
	Dan Carpenter, linux-crypto, linux-kernel

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 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/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;
 	}
 


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH 2/6] drivers/crypto/caam/caamalg.c: introduce missing
  2011-04-01 14:23 [PATCH 2/6] drivers/crypto/caam/caamalg.c: introduce missing kfree Julia Lawall
@ 2011-04-01 19:42 ` Kim Phillips
  2011-04-08 12:39   ` Herbert Xu
  0 siblings, 1 reply; 3+ messages in thread
From: Kim Phillips @ 2011-04-01 19:42 UTC (permalink / raw)
  To: Julia Lawall
  Cc: Herbert Xu, kernel-janitors, David S. Miller, Steve Cornelius,
	Dan Carpenter, linux-crypto, linux-kernel

On Fri, 1 Apr 2011 16:23:43 +0200
Julia Lawall <julia@diku.dk> wrote:

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

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

Acked-by: Kim Phillips <kim.phillips@freescale.com>

Kim


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH 2/6] drivers/crypto/caam/caamalg.c: introduce missing
  2011-04-01 19:42 ` [PATCH 2/6] drivers/crypto/caam/caamalg.c: introduce missing Kim Phillips
@ 2011-04-08 12:39   ` Herbert Xu
  0 siblings, 0 replies; 3+ messages in thread
From: Herbert Xu @ 2011-04-08 12:39 UTC (permalink / raw)
  To: Kim Phillips
  Cc: Julia Lawall, kernel-janitors, David S. Miller, Steve Cornelius,
	Dan Carpenter, linux-crypto, linux-kernel

On Fri, Apr 01, 2011 at 02:42:05PM -0500, Kim Phillips wrote:
> On Fri, 1 Apr 2011 16:23:43 +0200
> Julia Lawall <julia@diku.dk> wrote:
> 
> > Error handling code following a kmalloc should free the allocated data.
> 
> > Signed-off-by: Julia Lawall <julia@diku.dk>
> > ---
> 
> Acked-by: Kim Phillips <kim.phillips@freescale.com>

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

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2011-04-08 12:39 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-04-01 14:23 [PATCH 2/6] drivers/crypto/caam/caamalg.c: introduce missing kfree Julia Lawall
2011-04-01 19:42 ` [PATCH 2/6] drivers/crypto/caam/caamalg.c: introduce missing Kim Phillips
2011-04-08 12:39   ` Herbert Xu

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox