Skip to content

Commit

Permalink
drivers/net/smsc911x.c: Fix resource size off by 1 error
Browse files Browse the repository at this point in the history
The call resource_size(res) returns res->end - res->start + 1 and thus the
second change is semantics-preserving.  res_size is then used as the second
argument of a call to request_mem_region, and the memory allocated by this
call appears to be the same as what is released in the two calls to
release_mem_region.  So the size argument for those calls should be
resource_size(size) as well.  Alternatively, in the second call to
release_mem_region, the second argument could be res_size, as that variable
has already been initialized at the point of this call.

The problem was found using the following semantic patch:
(http://www.emn.fr/x-info/coccinelle/)

// <smpl>
@@
struct resource *res;
@@

- (res->end - res->start) + 1
+ resource_size(res)

@@
struct resource *res;
@@

- res->end - res->start
+ BAD(resource_size(res))
// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Julia Lawall authored and David S. Miller committed Jul 6, 2009
1 parent 4c3dd30 commit 3942453
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/net/smsc911x.c
Original file line number Diff line number Diff line change
Expand Up @@ -1938,7 +1938,7 @@ static int __devexit smsc911x_drv_remove(struct platform_device *pdev)
if (!res)
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

release_mem_region(res->start, res->end - res->start);
release_mem_region(res->start, resource_size(res));

iounmap(pdata->ioaddr);

Expand Down Expand Up @@ -1976,7 +1976,7 @@ static int __devinit smsc911x_drv_probe(struct platform_device *pdev)
retval = -ENODEV;
goto out_0;
}
res_size = res->end - res->start + 1;
res_size = resource_size(res);

irq_res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
if (!irq_res) {
Expand Down Expand Up @@ -2104,7 +2104,7 @@ static int __devinit smsc911x_drv_probe(struct platform_device *pdev)
out_free_netdev_2:
free_netdev(dev);
out_release_io_1:
release_mem_region(res->start, res->end - res->start);
release_mem_region(res->start, resource_size(res));
out_0:
return retval;
}
Expand Down

0 comments on commit 3942453

Please sign in to comment.