diff options
| author | Hante Meuleman <meuleman@broadcom.com> | 2012-11-14 18:46:13 -0800 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-11-16 14:28:54 -0500 |
| commit | df19e777e0587004bb926c73c7188e0d63f19372 (patch) | |
| tree | 7cdeb9c2f745525d014b4dc6ff9bc8b1efe565ed /drivers/net/wireless/brcm80211/brcmfmac | |
| parent | 0b63cb71f1e6b74a6f68a9c7b10d823fd9914d0a (diff) | |
| download | linux-df19e777e0587004bb926c73c7188e0d63f19372.tar.bz2 | |
brcmfmac: fix NULL pointer access in brcmf_fweh_detach()
brcmf_fweh_detach can be called while ifp is already NULL, due to
init error. Fix NULL pointer access by checking ifp.
Reviewed-by: Arend Van Spriel <arend@broadcom.com>
Signed-off-by: Hante Meuleman <meuleman@broadcom.com>
Signed-off-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/brcm80211/brcmfmac')
| -rw-r--r-- | drivers/net/wireless/brcm80211/brcmfmac/fweh.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/fweh.c b/drivers/net/wireless/brcm80211/brcmfmac/fweh.c index e1521afe6522..283acee1798b 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/fweh.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/fweh.c @@ -374,11 +374,13 @@ void brcmf_fweh_detach(struct brcmf_pub *drvr) struct brcmf_if *ifp = drvr->iflist[0]; s8 eventmask[BRCMF_EVENTING_MASK_LEN]; - /* clear all events */ - memset(eventmask, 0, BRCMF_EVENTING_MASK_LEN); - (void)brcmf_fil_iovar_data_set(ifp, "event_msgs", - eventmask, BRCMF_EVENTING_MASK_LEN); - + if (ifp) { + /* clear all events */ + memset(eventmask, 0, BRCMF_EVENTING_MASK_LEN); + (void)brcmf_fil_iovar_data_set(ifp, "event_msgs", + eventmask, + BRCMF_EVENTING_MASK_LEN); + } /* cancel the worker */ cancel_work_sync(&fweh->event_work); WARN_ON(!list_empty(&fweh->event_q)); |