Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c52666ae authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by Johannes Berg
Browse files

mac80211: fix suspend vs. association race 



If the association is in progress while we suspend, the
stack will be in a messed up state. Clean it before we
suspend.

This patch completes Johannes's patch:

1a1cb744
Author: Johannes Berg <johannes.berg@intel.com>

    mac80211: fix suspend vs. authentication race

Cc: <stable@vger.kernel.org>
Fixes: 12e7f517 ("mac80211: cleanup generic suspend/resume procedures")
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent f9ac71bf

net/mac80211/mlme.c

+13 −7
Original line number Diff line number Diff line
@@ -3598,17 +3598,23 @@ void ieee80211_mgd_quiesce(struct ieee80211_sub_if_data *sdata) 


	sdata_lock(sdata);



	if (ifmgd->auth_data) {

	if (ifmgd->auth_data || ifmgd->assoc_data) {

		const u8 *bssid = ifmgd->auth_data ?

				ifmgd->auth_data->bss->bssid :

				ifmgd->assoc_data->bss->bssid;



		/*

		 * If we are trying to authenticate while suspending, cfg80211

		 * won't know and won't actually abort those attempts, thus we

		 * need to do that ourselves.

		 * If we are trying to authenticate / associate while suspending,

		 * cfg80211 won't know and won't actually abort those attempts,

		 * thus we need to do that ourselves.

		 */

		ieee80211_send_deauth_disassoc(sdata,

					       ifmgd->auth_data->bss->bssid,

		ieee80211_send_deauth_disassoc(sdata, bssid,

					       IEEE80211_STYPE_DEAUTH,

					       WLAN_REASON_DEAUTH_LEAVING,

					       false, frame_buf);

		if (ifmgd->assoc_data)

			ieee80211_destroy_assoc_data(sdata, false);

		if (ifmgd->auth_data)

			ieee80211_destroy_auth_data(sdata, false);

		cfg80211_tx_mlme_mgmt(sdata->dev, frame_buf,

				      IEEE80211_DEAUTH_FRAME_LEN);