Skip to content

Commit a251acf

Browse files
Aniket Nagarnaikgregkh
authored andcommitted
mwifiex: fix NULL pointer dereference during hidden SSID scan
commit 17e524b upstream. This NULL pointer dereference is observed during suspend resume stress test. All pending commands are cancelled when system goes into suspend state. There a corner case in which host may receive response for last scan command after this and try to trigger extra active scan for hidden SSIDs. The issue is fixed by adding a NULL check to skip that extra scan. Fixes: 2375fa2 (mwifiex: fix unable to connect hidden SSID..) Signed-off-by: Aniket Nagarnaik <aniketn@marvell.com> Signed-off-by: Amitkumar Karwar <akarwar@marvell.com> Signed-off-by: Kalle Valo <kvalo@codeaurora.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 8cb5ad2 commit a251acf

File tree

1 file changed

+1
-1
lines changed
  • drivers/net/wireless/mwifiex

1 file changed

+1
-1
lines changed

drivers/net/wireless/mwifiex/scan.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1889,7 +1889,7 @@ mwifiex_active_scan_req_for_passive_chan(struct mwifiex_private *priv)
18891889
u8 id = 0;
18901890
struct mwifiex_user_scan_cfg *user_scan_cfg;
18911891

1892-
if (adapter->active_scan_triggered) {
1892+
if (adapter->active_scan_triggered || !priv->scan_request) {
18931893
adapter->active_scan_triggered = false;
18941894
return 0;
18951895
}

0 commit comments

Comments
 (0)