PCI: drivers/pci/hotplug/ibmphp_ebda.c: add missing iounmap
authorJulia Lawall <Julia.Lawall@lip6.fr>
Thu, 12 Jan 2012 09:55:16 +0000 (10:55 +0100)
committerJesse Barnes <jbarnes@virtuousgeek.org>
Tue, 14 Feb 2012 16:44:47 +0000 (08:44 -0800)
Add missing iounmap in error handling code, in a case where the function
already preforms iounmap on some other execution path.

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

// <smpl>
@@
expression e;
statement S,S1;
int ret;
@@
e = \(ioremap\|ioremap_nocache\)(...)
... when != iounmap(e)
if (<+...e...+>) S
... when any
    when != iounmap(e)
*if (...)
   { ... when != iounmap(e)
     return ...; }
... when any
iounmap(e);
// </smpl>

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
drivers/pci/hotplug/ibmphp_ebda.c

index 2850e64dedae3e0cb9e258d113b75156aff891d3..714ca5c4ed505da0f47eed969c4cff84108ba75e 100644 (file)
@@ -368,8 +368,10 @@ int __init ibmphp_access_ebda (void)
                        debug ("rio blk id: %x\n", blk_id);
 
                        rio_table_ptr = kzalloc(sizeof(struct rio_table_hdr), GFP_KERNEL);
-                       if (!rio_table_ptr)
-                               return -ENOMEM; 
+                       if (!rio_table_ptr) {
+                               rc = -ENOMEM;
+                               goto out;
+                       }
                        rio_table_ptr->ver_num = readb (io_mem + offset);
                        rio_table_ptr->scal_count = readb (io_mem + offset + 1);
                        rio_table_ptr->riodev_count = readb (io_mem + offset + 2);