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

Commit 6f07d216 authored by Luciano Coelho's avatar Luciano Coelho Committed by Johannes Berg
Browse files

mac80211: lock sdata in ieee80211_csa_connection_drop_work() 



We call ieee80211_ibss_disconnect(), which requires sdata to be
locked, so lock the sdata during ieee80211_csa_connection_drop_work().

Cc: Simon Wunderlich <sw@simonwunderlich.de>
Signed-off-by: default avatarLuciano Coelho <luciano.coelho@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 70dabeb7

net/mac80211/ibss.c

+4 −0
Original line number Diff line number Diff line
@@ -753,12 +753,16 @@ static void ieee80211_csa_connection_drop_work(struct work_struct *work) 
		container_of(work, struct ieee80211_sub_if_data,

			     u.ibss.csa_connection_drop_work);



	sdata_lock(sdata);



	ieee80211_ibss_disconnect(sdata);

	synchronize_rcu();

	skb_queue_purge(&sdata->skb_queue);



	/* trigger a scan to find another IBSS network to join */

	ieee80211_queue_work(&sdata->local->hw, &sdata->work);



	sdata_unlock(sdata);

}



static void ieee80211_ibss_csa_mark_radar(struct ieee80211_sub_if_data *sdata)