Commit fd2696f399e45347c07f1f7f340e8515cace5657

Authored by Julia Lawall
Committed by Chris Mason
1 parent 49cf6f4529

Btrfs: introduce missing kfree

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>
Signed-off-by: Chris Mason <chris.mason@oracle.com>

Showing 1 changed file with 3 additions and 1 deletions Side-by-side Diff

... ... @@ -446,8 +446,10 @@
446 446 goto error;
447 447  
448 448 device->name = kstrdup(orig_dev->name, GFP_NOFS);
449   - if (!device->name)
  449 + if (!device->name) {
  450 + kfree(device);
450 451 goto error;
  452 + }
451 453  
452 454 device->devid = orig_dev->devid;
453 455 device->work.func = pending_bios_fn;