summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorLuca Coelho <luciano.coelho@intel.com>2017-05-02 17:56:21 +0300
committerJohannes Berg <johannes.berg@intel.com>2017-05-08 11:23:50 +0200
commitf8860ce836f2d502b07ef99559707fe55d90f5bc (patch)
treec4c86a2e54ba42f8d9286187685c7979891a9e35 /net
parent2f242bf45370b8ea44f209b22c3c90984655a102 (diff)
downloadlinux-f8860ce836f2d502b07ef99559707fe55d90f5bc.tar.bz2
mac80211: bail out from prep_connection() if a reconfig is ongoing
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>
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/mlme.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 89dff563b1ec..0ea9712bd99e 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -4382,6 +4382,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);