From: Luca Coelho <luciano.coelho@intel.com>
Date: Tue, 2 May 2017 14:56:21 +0000 (+0300)
Subject: mac80211: bail out from prep_connection() if a reconfig is ongoing
X-Git-Tag: v3.18.105~119
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b3b0df34dd5eeab163f696e583ddbb9be5e887d5;p=thirdparty%2Fkernel%2Fstable.git

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


[ 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
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index b13634c677f16..156e8e13ffed1 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -3995,6 +3995,10 @@ static int ieee80211_prep_connection(struct ieee80211_sub_if_data *sdata,
 	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);