Patch "mac80211: bail out from prep_connection() if a reconfig is ongoing" has been added to the 3.18-stable tree

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

mac80211: bail out from prep_connection() if a reconfig is ongoing

to the 3.18-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:
mac80211-bail-out-from-prep_connection-if-a-reconfig-is-ongoing.patch
and it can be found in the queue-3.18 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Luca Coelho <[email protected]>
Date: Tue, 2 May 2017 17:56:21 +0300
Subject: mac80211: bail out from prep_connection() if a reconfig is ongoing

From: Luca Coelho <[email protected]>

[ Upstream commit f8860ce836f2d502b07ef99559707fe55d90f5bc ]

If ieee80211_hw_restart() is called during authentication, the authentication process will continue, causing the driver to be called in a wrong state. This ultimately causes an oops in the iwlwifi driver (at least).

This fixes bugzilla 195299 partly.

Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=195299

---
 net/mac80211/mlme.c |    4 ++++
 1 file changed, 4 insertions(+)

@@ -3995,6 +3995,10 @@ static int ieee80211_prep_connection(str
 	if (WARN_ON(!ifmgd->auth_data && !ifmgd->assoc_data))
 		return -EINVAL;
 
+	/* If a reconfig is happening, bail out */
+	if (local->in_reconfig)
+		return -EBUSY;
+
 	if (assoc) {
 		rcu_read_lock();
 		have_sta = sta_info_get(sdata, cbss->bssid);

Patches currently in stable-queue which might be from [email protected] are

queue-3.18/mac80211-bail-out-from-prep_connection-if-a-reconfig-is-ongoing.patch