Skip to content

Commit

Permalink
USB: ehci-omap.c: introduce missing kfree
Browse files Browse the repository at this point in the history
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Julia Lawall authored and Greg Kroah-Hartman committed Dec 11, 2009
1 parent 06e1829 commit b2b6080
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion drivers/usb/host/ehci-omap.c
Original file line number Diff line number Diff line change
Expand Up @@ -558,7 +558,7 @@ static int ehci_hcd_omap_probe(struct platform_device *pdev)
omap = kzalloc(sizeof(*omap), GFP_KERNEL);
if (!omap) {
ret = -ENOMEM;
goto err_create_hcd;
goto err_disabled;
}

hcd = usb_create_hcd(&ehci_omap_hc_driver, &pdev->dev,
Expand Down Expand Up @@ -653,6 +653,7 @@ static int ehci_hcd_omap_probe(struct platform_device *pdev)
usb_put_hcd(hcd);

err_create_hcd:
kfree(omap);
err_disabled:
err_pdata:
return ret;
Expand Down

0 comments on commit b2b6080

Please sign in to comment.