]> git.karo-electronics.de Git - linux-beck.git/commitdiff
drivers/char/agp/parisc-agp.c: eliminate memory leak
authorJulia Lawall <julia@diku.dk>
Wed, 20 Oct 2010 22:55:45 +0000 (15:55 -0700)
committerKyle McMartin <kyle@mcmartin.ca>
Fri, 22 Oct 2010 01:03:47 +0000 (21:03 -0400)
alloc_pci_dev allocates some memory, so that memory should be freed before
leaving the function in an error case.

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

// <smpl>
@r exists@
local idexpression x;
expression E;
identifier f1;
iterator I;
@@

x = alloc_pci_dev(...);
<... when != x
     when != true (x == NULL || ...)
     when != if (...) { <+...x...+> }
     when != I (...) { <+...x...+> }
(
 x == NULL
|
 x == E
|
 x->f1
)
...>
* return ...;
// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>
Dan Carpenter <error27@gmail.com>
Dave Airlie <airlied@linux.ie>
Cc: Helge Deller <deller@gmx.de>
Cc: "James E.J. Bottomley" <jejb@parisc-linux.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Kyle McMartin <kyle@redhat.com>
drivers/char/agp/parisc-agp.c

index 1c129211302d34e15c6fce2a4475fce8b15a32d5..17e380f5f818f6d0aa3ada75d3dc614975b51781 100644 (file)
@@ -358,8 +358,12 @@ parisc_agp_setup(void __iomem *ioc_hpa, void __iomem *lba_hpa)
        bridge->dev = fake_bridge_dev;
 
        error = agp_add_bridge(bridge);
+       if (error)
+               goto fail;
+       return 0;
 
 fail:
+       kfree(fake_bridge_dev);
        return error;
 }