brcmsmac: mac80211_if: Fix a resource leak in an error handling path

Message ID 8fbc171a1a493b38db5a6f0873c6021fca026a6c.1620852921.git.christophe.jaillet@wanadoo.fr
State New
Headers show
Series
  • brcmsmac: mac80211_if: Fix a resource leak in an error handling path
Related show

Commit Message

Christophe JAILLET May 12, 2021, 8:58 p.m.
If 'brcms_attach()' fails, we must undo the previous 'ieee80211_alloc_hw()'
as already done in the remove function.

Fixes: 5b435de0d786 ("net: wireless: add brcm80211 drivers")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
 .../wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c    | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

Comments

Kalle Valo June 15, 2021, 10:43 a.m. | #1
Christophe JAILLET <christophe.jaillet@wanadoo.fr> wrote:

> If 'brcms_attach()' fails, we must undo the previous 'ieee80211_alloc_hw()'

> as already done in the remove function.

> 

> Fixes: 5b435de0d786 ("net: wireless: add brcm80211 drivers")

> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>

> Acked-by: Arend van Spriel <arend.vanspriel@broadcom.com>


Patch applied to wireless-drivers-next.git, thanks.

9a25344d5177 brcmsmac: mac80211_if: Fix a resource leak in an error handling path

-- 
https://patchwork.kernel.org/project/linux-wireless/patch/8fbc171a1a493b38db5a6f0873c6021fca026a6c.1620852921.git.christophe.jaillet@wanadoo.fr/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

Patch

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c
index 39f3af2d0439..eadac0f5590f 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c
@@ -1220,6 +1220,7 @@  static int brcms_bcma_probe(struct bcma_device *pdev)
 {
 	struct brcms_info *wl;
 	struct ieee80211_hw *hw;
+	int ret;
 
 	dev_info(&pdev->dev, "mfg %x core %x rev %d class %d irq %d\n",
 		 pdev->id.manuf, pdev->id.id, pdev->id.rev, pdev->id.class,
@@ -1244,11 +1245,16 @@  static int brcms_bcma_probe(struct bcma_device *pdev)
 	wl = brcms_attach(pdev);
 	if (!wl) {
 		pr_err("%s: brcms_attach failed!\n", __func__);
-		return -ENODEV;
+		ret = -ENODEV;
+		goto err_free_ieee80211;
 	}
 	brcms_led_register(wl);
 
 	return 0;
+
+err_free_ieee80211:
+	ieee80211_free_hw(hw);
+	return ret;
 }
 
 static int brcms_suspend(struct bcma_device *pdev)