| Message ID | 1442606899-31872-2-git-send-email-arend@broadcom.com (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Kalle Valo |
| Headers | show |
On 09/18/2015 10:08 PM, Arend van Spriel wrote: > From: Hante Meuleman <meuleman@broadcom.com> > > In some exception situations the ifp->vif was not properly assigned > which could result in crash. Tested-by: Rafa? Mi?ecki <zajec5@gmail.com> > 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> > --- > drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c > index 600098d..da24bf0 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; > -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
> From: Hante Meuleman <meuleman@broadcom.com> > > 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> Thanks, 16 patches applied to wireless-drivers-next.git: 2b5d348ee786 brcmfmac: Fix exception handling. e3c92cb2eea3 brcmfmac: Add support for the BCM4350 PCIE device. 60dc35ef9ffd brcmfmac: Fix set and get tx-power functions. 6ea696eb4e26 brcmfmac: Only assign primary netdev to if2bss array. ae7c03f68ee2 brcmfmac: Inform p2p module about p2pon through API 9f64df940cfe brcmfmac: Fix bug in flowring management. 43e55a2a1cf0 brcmfmac: Make p2pon module param always available. 178e9ef9b6c6 brcmfmac: Workaround in change vif for wpa_supplicant support. 9831bcb987df brcmfmac: Deleting of p2p device is leaking memory. d1bb34c128f5 brcmfmac: Only handle p2p_stop_device if vif is valid 35a3cbcc49b5 brcmfmac: Fix p2p bug for older firmwares. 8268c2011d25 brcmfmac: Add module parameter to disable features. a2044d91d9d2 brcmfmac: Fix race condition bug when deleting p2p interface. 55acca90da52 brcmfmac: Add support for the BCM4365 and BCM4366 PCIE devices. cb8dc71f516a brcmfmac: Fix TDLS setup by properly handling p2p noif. 29b93c0e3c38 brcmfmac: Accept events when TDLS is used in combination with p2p. Kalle Valo -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c index 600098d..da24bf0 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;