Commit b3b0df34 authored May 02, 2017 by Luca Coelho Committed by Greg Kroah-Hartman Apr 13, 2018

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>

parent bc705996

net/mac80211/mlme.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -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);