Commit 9a25344d authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Kalle Valo
Browse files

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



If 'brcms_attach()' fails, we must undo the previous 'ieee80211_alloc_hw()'
as already done in the remove function.

Fixes: 5b435de0 ("net: wireless: add brcm80211 drivers")
Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Acked-by: default avatarArend van Spriel <arend.vanspriel@broadcom.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/8fbc171a1a493b38db5a6f0873c6021fca026a6c.1620852921.git.christophe.jaillet@wanadoo.fr
parent 34fe7038

drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c

+7 −1
Original line number Diff line number Diff line
@@ -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)