]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
xen-pcifront: fix PCI reference leak
authorJiri Slaby <jslaby@suse.cz>
Thu, 4 Nov 2010 14:31:30 +0000 (15:31 +0100)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Mon, 8 Nov 2010 16:41:15 +0000 (11:41 -0500)
Stanse found that when pdev is found and has no driver a reference is
leaked in pcifront_common_process. So add pci_dev_put there. For the
pdev == NULL case, pci_dev_put(NULL) is fine.

[v2: Updated to not dereference pcidev->dev per Milton's observation]

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Milton Miller <miltonm@bga.com>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
drivers/pci/xen-pcifront.c

index 05792732718e12111a63bfe628997f9227189093..3a5a6fcc0eada9305be0acd3e0a67e8348c85a62 100644 (file)
@@ -575,8 +575,9 @@ static pci_ers_result_t pcifront_common_process(int cmd,
 
        pcidev = pci_get_bus_and_slot(bus, devfn);
        if (!pcidev || !pcidev->driver) {
-               dev_err(&pcidev->dev,
-                       "device or driver is NULL\n");
+               dev_err(&pdev->xdev->dev, "device or AER driver is NULL\n");
+               if (pcidev)
+                       pci_dev_put(pcidev);
                return result;
        }
        pdrv = pcidev->driver;