libertas: fix potential NULL-pointer dereference
PATCH 1/1 libertas: fix potential NULL-pointer dereference
The code wants to check if there's a channel and it is not disabled, but it used to check if channel is not NULL and accessed the channel struct if this check failed.
Signed-off-by Sven Neumann <[email protected]>
--- drivers/net/wireless/libertas/cfg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/net/wireless/libertas/cfg.c +1 -1
@@ -619,7 +619,7 @@ static int lbs_ret_scan(struct lbs_private *priv, unsigned long dummy,print_ssid (ssid_buf, ssid, ssid_len), LBS_SCAN_RSSI_TO_MBM(rssi)/100); -if (channel || +if (channel && !(channel->flags &IEEE80211_CHAN_DISABLED )) cfg80211_inform_bss(wiphy, channel, bssid, le64_to_cpu(*(__le64 *)tsfdesc),
Signature · 1 line
1.7.2.3
Quoted 5 lines · Sven Neumann
The code wants to check if there's a channel and it is not disabled, but it used to check if channel is not NULL and accessed the channel struct if this check failed.
Signed-off-by Sven Neumann <[email protected]>
Acked-by Dan Williams <[email protected]>
Quoted 17 lines
--- drivers/net/wireless/libertas/cfg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)drivers/net/wireless/libertas/cfg.c +1
-1@@ -619,7 +619,7 @@ static int lbs_ret_scan(struct lbs_private *priv, unsigned long dummy,print_ssid (ssid_buf, ssid, ssid_len), LBS_SCAN_RSSI_TO_MBM(rssi)/100); -if (channel || +if (channel && !(channel->flags &IEEE80211_CHAN_DISABLED )) cfg80211_inform_bss(wiphy, channel, bssid, le64_to_cpu(*(__le64 *)tsfdesc),