Commit 20d5a0b9 authored by Miri Korenblit's avatar Miri Korenblit Committed by Johannes Berg
Browse files

wifi: mac80211: don't queue sdata::work for a non-running sdata 



The worker really shouldn't be queued for a non-running interface.
Also, if ieee80211_setup_sdata is called between queueing and executing
the wk, it will be initialized, which will corrupt wiphy_work_list.

Fixes: f8891461 ("mac80211: do not start any work during reconfigure flow")
Signed-off-by: default avatarMiri Korenblit <miriam.rachel.korenblit@intel.com>
Reviewed-by: default avatarJohannes Berg <johannes.berg@intel.com>
Link: https://patch.msgid.link/20250306123626.1e02caf82640.I4949e71ed56e7186ed4968fa9ddff477473fa2f4@changeid


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 43e04077

net/mac80211/util.c

+5 −3
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
 * Copyright 2007	Johannes Berg <johannes@sipsolutions.net>

 * Copyright 2013-2014  Intel Mobile Communications GmbH

 * Copyright (C) 2015-2017	Intel Deutschland GmbH

 * Copyright (C) 2018-2024 Intel Corporation

 * Copyright (C) 2018-2025 Intel Corporation

 *

 * utilities for mac80211

 */
@@ -2193,9 +2193,11 @@ int ieee80211_reconfig(struct ieee80211_local *local) 
		ieee80211_reconfig_roc(local);



		/* Requeue all works */

		list_for_each_entry(sdata, &local->interfaces, list)

		list_for_each_entry(sdata, &local->interfaces, list) {

			if (ieee80211_sdata_running(sdata))

				wiphy_work_queue(local->hw.wiphy, &sdata->work);

		}

	}



	ieee80211_wake_queues_by_reason(hw, IEEE80211_MAX_QUEUE_MAP,

					IEEE80211_QUEUE_STOP_REASON_SUSPEND,