* [PATCH -next] brcmfmac: fix potential NULL pointer dereference in brcmf_fws_flow_control_check()
@ 2013-04-19 2:14 Wei Yongjun
2013-04-19 8:12 ` Arend van Spriel
0 siblings, 1 reply; 2+ messages in thread
From: Wei Yongjun @ 2013-04-19 2:14 UTC (permalink / raw)
To: brudley, arend, frankyl, meuleman, linville, pieterpg, phaber
Cc: yongjun_wei, linux-wireless, brcm80211-dev-list
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
The dereference to 'ifp' in debug code should be moved below the NULL test.
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
---
drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c b/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c
index 1bcd58c..69d5ad2 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c
@@ -821,11 +821,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,
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH -next] brcmfmac: fix potential NULL pointer dereference in brcmf_fws_flow_control_check()
2013-04-19 2:14 [PATCH -next] brcmfmac: fix potential NULL pointer dereference in brcmf_fws_flow_control_check() Wei Yongjun
@ 2013-04-19 8:12 ` Arend van Spriel
0 siblings, 0 replies; 2+ messages in thread
From: Arend van Spriel @ 2013-04-19 8:12 UTC (permalink / raw)
To: Wei Yongjun
Cc: brudley, frankyl, meuleman, linville, pieterpg, phaber,
yongjun_wei, linux-wireless, brcm80211-dev-list
On 04/19/2013 04:14 AM, Wei Yongjun wrote:
> From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
>
> The dereference to 'ifp' in debug code should be moved below the NULL test.
Acked-by: Arend van Spriel <arend@broadcom.com>
> Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
> ---
> drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c b/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c
> index 1bcd58c..69d5ad2 100644
> --- a/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c
> +++ b/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c
> @@ -821,11 +821,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,
>
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-04-19 8:13 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-04-19 2:14 [PATCH -next] brcmfmac: fix potential NULL pointer dereference in brcmf_fws_flow_control_check() Wei Yongjun
2013-04-19 8:12 ` Arend van Spriel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).