[PATCH] hostap: Fix memory leak on PCI probe error path

The Coverity checker (CID: 659, 660) spotted this resource leak on
PCI probe error path. Free private data structure if pci_enable_device()
fails.

Signed-off-by: Jouni Malinen <jkmaline@cc.hut.fi>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

2 files changed, 8 insertions, 5 deletions

diff --git a/drivers/net/wireless/hostap/hostap_pci.c b/drivers/net/wireless/hostap/hostap_pci.c
index 2e85bdced2dd..194f07097581 100644
--- a/drivers/net/wireless/hostap/hostap_pci.c
+++ b/drivers/net/wireless/hostap/hostap_pci.c
@@ -307,7 +307,7 @@ static int prism2_pci_probe(struct pci_dev *pdev,
         memset(hw_priv, 0, sizeof(*hw_priv));
 
         if (pci_enable_device(pdev))
-                return -EIO;
+                goto err_out_free;
 
         phymem = pci_resource_start(pdev, 0);
 
@@ -368,6 +368,8 @@ static int prism2_pci_probe(struct pci_dev *pdev,
  err_out_disable:
         pci_disable_device(pdev);
         prism2_free_local_data(dev);
+
+ err_out_free:
         kfree(hw_priv);
 
         return -ENODEV;
diff --git a/drivers/net/wireless/hostap/hostap_plx.c b/drivers/net/wireless/hostap/hostap_plx.c
index e258517ac85d..edaaa943eb8f 100644
--- a/drivers/net/wireless/hostap/hostap_plx.c
+++ b/drivers/net/wireless/hostap/hostap_plx.c
@@ -452,7 +452,7 @@ static int prism2_plx_probe(struct pci_dev *pdev,
         memset(hw_priv, 0, sizeof(*hw_priv));
 
         if (pci_enable_device(pdev))
-                return -EIO;
+                goto err_out_free;
 
         /* National Datacomm NCP130 based on TMD7160, not PLX9052. */
         tmd7160 = (pdev->vendor == 0x15e8) && (pdev->device == 0x0131);
@@ -567,9 +567,6 @@ static int prism2_plx_probe(struct pci_dev *pdev,
         return hostap_hw_ready(dev);
 
  fail:
-        prism2_free_local_data(dev);
-        kfree(hw_priv);
-
         if (irq_registered && dev)
                 free_irq(dev->irq, dev);
 
@@ -577,6 +574,10 @@ static int prism2_plx_probe(struct pci_dev *pdev,
                 iounmap(attr_mem);
 
         pci_disable_device(pdev);
+        prism2_free_local_data(dev);
+
+ err_out_free:
+        kfree(hw_priv);
 
         return -ENODEV;
 }