From: Hante Meuleman <meuleman@broadcom.com>
Date: Wed, 25 Nov 2015 10:32:47 +0000 (+0100)
Subject: brcmfmac: Fix double free on exception at module load.
X-Git-Tag: v4.5-rc1~128^2~185^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5536f20a1c43417901e5bb66d62c38853e070be5;p=thirdparty%2Flinux.git

brcmfmac: Fix double free on exception at module load.

Reviewed-by: Arend Van Spriel <arend@broadcom.com>
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Signed-off-by: Hante Meuleman <meuleman@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
---

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
index 90389320de135..3a39192e3f143 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
@@ -1083,6 +1083,8 @@ fail:
 			brcmf_net_detach(ifp->ndev);
 		if (p2p_ifp)
 			brcmf_net_detach(p2p_ifp->ndev);
+		drvr->iflist[0] = NULL;
+		drvr->iflist[1] = NULL;
 		return ret;
 	}
 	return 0;