Patch "mwifiex: fix NULL pointer dereference during hidden SSID scan" has been added to the 4.3-stable tree

Patch "mwifiex: fix NULL pointer dereference during hidden SSID scan" has been added to the 4.3-stable tree

[gregkh]

This is a note to let you know that I've just added the patch titled

    mwifiex: fix NULL pointer dereference during hidden SSID scan

to the 4.3-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     mwifiex-fix-null-pointer-dereference-during-hidden-ssid-scan.patch
and it can be found in the queue-4.3 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>From 17e524b1b60f4390d24a51d9524d1648cf5d1447 Mon Sep 17 00:00:00 2001
From: Aniket Nagarnaik <aniketn@marvell.com>
Date: Fri, 18 Sep 2015 06:32:09 -0700
Subject: mwifiex: fix NULL pointer dereference during hidden SSID scan

From: Aniket Nagarnaik <aniketn@marvell.com>

commit 17e524b1b60f4390d24a51d9524d1648cf5d1447 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: 2375fa2b36feaf34 (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>

---
 drivers/net/wireless/mwifiex/scan.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/drivers/net/wireless/mwifiex/scan.c
+++ b/drivers/net/wireless/mwifiex/scan.c
@@ -1889,7 +1889,7 @@ mwifiex_active_scan_req_for_passive_chan
 	u8 id = 0;
 	struct mwifiex_user_scan_cfg  *user_scan_cfg;
 
-	if (adapter->active_scan_triggered) {
+	if (adapter->active_scan_triggered || !priv->scan_request) {
 		adapter->active_scan_triggered = false;
 		return 0;
 	}


Patches currently in stable-queue which might be from aniketn@marvell.com are

queue-4.3/mwifiex-fix-null-pointer-dereference-during-hidden-ssid-scan.patch