From: Keir Fraser <keir@xen.org>
Date: Mon, 15 Nov 2010 09:32:57 +0000 (+0000)
Subject: pcifront: fix PCI reference leak
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=cc51dbdf0e254094c2494cfec8a1d46a770e70dd;p=legacy%2Flinux-2.6.18-xen.git

pcifront: fix PCI reference leak

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.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>

From: Jiri Slaby <jslaby@suse.cz>
Subject: pcifront: fix potential NULL dereference

Milton spotted that we dereference NULL in one fail path in
pcifront_common_process. Fix that by using different device to print
out an error.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Cc: Milton Miller <miltonm@bga.com>

Signed-off-by: Jan Beulich <jbeulich@novell.com>
---

diff --git a/drivers/xen/pcifront/pci_op.c b/drivers/xen/pcifront/pci_op.c
index b1fc6b3c..474a1322 100644
--- a/drivers/xen/pcifront/pci_op.c
+++ b/drivers/xen/pcifront/pci_op.c
@@ -592,9 +592,9 @@ static pci_ers_result_t pcifront_common_process( int cmd, struct pcifront_device
 	result = PCI_ERS_RESULT_NONE;
 
 	pcidev = pci_get_bus_and_slot(bus, devfn);
-	if (!pcidev || !pcidev->driver){
-		dev_err(&pcidev->dev, 
-			"device or driver is NULL\n");
+	if (!pcidev || !pcidev->driver) {
+		pci_dev_put(pcidev);
+		dev_err(&pdev->xdev->dev, "AER device or driver is NULL\n");
 		return result;
 	}
 	pdrv = pcidev->driver;