2012-10-18 10:10:50

by Yuanhan Liu

Subject: [PATCH] brcmfmac: fix potential NULL dereference

Fix a samtch warnings catched by Fengguang's 0-DAY system:
+ drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c:3572 brcmf_cfg80211_sched_scan_start() error: we previously assumed 'request' could be null (see line 3571)

Cc: John W. Linville <[email protected]>
Signed-off-by: Yuanhan Liu <[email protected]>
---
.../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
index c1abaa6..eaeabee 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
@@ -3569,7 +3569,7 @@ brcmf_cfg80211_sched_scan_start(struct wiphy *wiphy,

if (!request || !request->n_ssids || !request->n_match_sets) {
WL_ERR("Invalid sched scan req!! n_ssids:%d\n",
- request->n_ssids);
+ request ? request->n_ssids : 0);
return -EINVAL;
}

--
1.7.7.6

2012-10-18 18:32:30

by Franky Lin

Subject: Re: [PATCH] brcmfmac: fix potential NULL dereference

On 10/18/2012 03:10 AM, Yuanhan Liu wrote:
> Fix a samtch warnings catched by Fengguang's 0-DAY system:
> + drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c:3572 brcmf_cfg80211_sched_scan_start() error: we previously assumed 'request' could be null (see line 3571)
>
> Cc: John W. Linville <[email protected]>
> Signed-off-by: Yuanhan Liu <[email protected]>
> ---

Thanks

Acked-by: Franky Lin <[email protected]>

Franky