Skip to content

Commit

Permalink
drivers/usb/host/isp1760-if.c: introduce missing kfree
Browse files Browse the repository at this point in the history
drvdata needds to be freed before leaving the function in an error case.

A simplified version of the semantic match that finds the problem is as
follows: (http://coccinelle.lip6.fr)

// <smpl>
@r exists@
local idexpression x;
statement S;
identifier f1;
position p1,p2;
expression *ptr != NULL;
@@

x@p1 = \(kmalloc\|kzalloc\|kcalloc\)(...);
...
if (x == NULL) S
<... when != x
     when != if (...) { <+...x...+> }
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 Jan 4, 2012
1 parent 3c8c931 commit 30a0dee
Showing 1 changed file with 9 additions and 4 deletions.
13 changes: 9 additions & 4 deletions drivers/usb/host/isp1760-if.c
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,18 @@ static int of_isp1760_probe(struct platform_device *dev)
return -ENOMEM;

ret = of_address_to_resource(dp, 0, &memory);
if (ret)
return -ENXIO;
if (ret) {
ret = -ENXIO;
goto free_data;
}

res_len = resource_size(&memory);

res = request_mem_region(memory.start, res_len, dev_name(&dev->dev));
if (!res)
return -EBUSY;
if (!res) {
ret = -EBUSY;
goto free_data;
}

if (of_irq_map_one(dp, 0, &oirq)) {
ret = -ENODEV;
Expand Down Expand Up @@ -125,6 +129,7 @@ static int of_isp1760_probe(struct platform_device *dev)
gpio_free(drvdata->rst_gpio);
release_reg:
release_mem_region(memory.start, res_len);
free_data:
kfree(drvdata);
return ret;
}
Expand Down

0 comments on commit 30a0dee

Please sign in to comment.