From: Hante Meuleman <meuleman@broadcom.com>
Date: Fri, 18 Sep 2015 20:08:04 +0000 (+0200)
Subject: brcmfmac: Fix exception handling.
X-Git-Tag: v4.4-rc1~141^2~157^2~26
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2b5d348ee786dd875b3aa8536a97ff6f6421d018;p=thirdparty%2Flinux.git

brcmfmac: Fix exception handling.

In some exception situations the ifp->vif was not properly assigned
which could result in crash.

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/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c
index 600098dd197cb..da24bf0d43f6d 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c
@@ -6332,6 +6332,7 @@ wiphy_unreg_out:
 priv_out:
 	wl_deinit_priv(cfg);
 	brcmf_free_vif(vif);
+	ifp->vif = NULL;
 wiphy_out:
 	brcmf_free_wiphy(wiphy);
 	return NULL;