diff options
| author | Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2013-04-19 10:14:31 +0800 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-04-22 15:20:25 -0400 |
| commit | 16a1f736708239a13b475a5b12e5928a834805bc (patch) | |
| tree | f8fbf0e5139463a2deeffdeb30a3039009b29e9d /drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c | |
| parent | 4fc4118cdb29ab946b8a586fc766ebb6ae1e1c90 (diff) | |
| download | lwn-16a1f736708239a13b475a5b12e5928a834805bc.tar.gz lwn-16a1f736708239a13b475a5b12e5928a834805bc.zip | |
brcmfmac: fix potential NULL pointer dereference in brcmf_fws_flow_control_check()
The dereference to 'ifp' in debug code should be moved below the NULL test.
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Acked-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c')
| -rw-r--r-- | drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c b/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c index 8ae7da8bf688..66cdc45add4e 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c @@ -834,11 +834,12 @@ brcmf_fws_flow_control_check(struct brcmf_fws_info *fws, struct pktq *pq, { struct brcmf_if *ifp = fws->drvr->iflist[if_id]; - brcmf_dbg(TRACE, - "enter: bssidx=%d, ifidx=%d\n", ifp->bssidx, ifp->ifidx); if (WARN_ON(!ifp)) return; + brcmf_dbg(TRACE, + "enter: bssidx=%d, ifidx=%d\n", ifp->bssidx, ifp->ifidx); + if ((ifp->netif_stop & BRCMF_NETIF_STOP_REASON_FWS_FC) && pq->len <= BRCMF_FWS_FLOWCONTROL_LOWATER) brcmf_txflowblock_if(ifp, |