linux-kernel - [PATCH] wireless: ipw2x00: Refine the error handling of ipw2100_pci_init

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:   Sat,  9 Apr 2022 14:24:49 +0800
From:   Zheyu Ma <zheyuma97@...il.com>
To:     stas.yakovlev@...il.com, kvalo@...nel.org, davem@...emloft.net,
        kuba@...nel.org, pabeni@...hat.com
Cc:     linux-wireless@...r.kernel.org, netdev@...r.kernel.org,
        linux-kernel@...r.kernel.org, Zheyu Ma <zheyuma97@...il.com>
Subject: [PATCH] wireless: ipw2x00: Refine the error handling of ipw2100_pci_init_one()

The driver should release resources in reverse order, i.e., the
resources requested first should be released last, and the driver
should adjust the order of error handling code by this rule.

Signed-off-by: Zheyu Ma <zheyuma97@...il.com>
---
 drivers/net/wireless/intel/ipw2x00/ipw2100.c | 34 +++++++++-----------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/drivers/net/wireless/intel/ipw2x00/ipw2100.c b/drivers/net/wireless/intel/ipw2x00/ipw2100.c
index 2ace2b27ecad..b10d10660eb8 100644
--- a/drivers/net/wireless/intel/ipw2x00/ipw2100.c
+++ b/drivers/net/wireless/intel/ipw2x00/ipw2100.c
@@ -6166,7 +6166,7 @@ static int ipw2100_pci_init_one(struct pci_dev *pci_dev,
 		printk(KERN_WARNING DRV_NAME
 		       "Error calling ioremap.\n");
 		err = -EIO;
-		goto fail;
+		goto out;
 	}
 
 	/* allocate and initialize our net_device */
@@ -6175,36 +6175,33 @@ static int ipw2100_pci_init_one(struct pci_dev *pci_dev,
 		printk(KERN_WARNING DRV_NAME
 		       "Error calling ipw2100_alloc_device.\n");
 		err = -ENOMEM;
-		goto fail;
+		goto fail_iounmap;
 	}
 
+	priv = libipw_priv(dev);
+	pci_set_master(pci_dev);
+	pci_set_drvdata(pci_dev, priv);
+
 	/* set up PCI mappings for device */
 	err = pci_enable_device(pci_dev);
 	if (err) {
 		printk(KERN_WARNING DRV_NAME
 		       "Error calling pci_enable_device.\n");
-		return err;
+		goto fail_dev;
 	}
 
-	priv = libipw_priv(dev);
-
-	pci_set_master(pci_dev);
-	pci_set_drvdata(pci_dev, priv);
-
 	err = dma_set_mask(&pci_dev->dev, DMA_BIT_MASK(32));
 	if (err) {
 		printk(KERN_WARNING DRV_NAME
 		       "Error calling pci_set_dma_mask.\n");
-		pci_disable_device(pci_dev);
-		return err;
+		goto fail_disable;
 	}
 
 	err = pci_request_regions(pci_dev, DRV_NAME);
 	if (err) {
 		printk(KERN_WARNING DRV_NAME
 		       "Error calling pci_request_regions.\n");
-		pci_disable_device(pci_dev);
-		return err;
+		goto fail_disable;
 	}
 
 	/* We disable the RETRY_TIMEOUT register (0x41) to keep
@@ -6306,9 +6303,13 @@ static int ipw2100_pci_init_one(struct pci_dev *pci_dev,
 out:
 	return err;
 
-      fail_unlock:
+fail_unlock:
 	mutex_unlock(&priv->action_mutex);
-      fail:
+fail:
+	pci_release_regions(pci_dev);
+fail_disable:
+	pci_disable_device(pci_dev);
+fail_dev:
 	if (dev) {
 		if (registered >= 2)
 			unregister_netdev(dev);
@@ -6334,11 +6335,8 @@ static int ipw2100_pci_init_one(struct pci_dev *pci_dev,
 
 		free_libipw(dev, 0);
 	}
-
+fail_iounmap:
 	pci_iounmap(pci_dev, ioaddr);
-
-	pci_release_regions(pci_dev);
-	pci_disable_device(pci_dev);
 	goto out;
 }
 
-- 
2.25.1