]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
wifi: mac80211: don't queue sdata::work for a non-running sdata
authorMiri Korenblit <miriam.rachel.korenblit@intel.com>
Thu, 6 Mar 2025 10:37:56 +0000 (12:37 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Fri, 7 Mar 2025 08:57:39 +0000 (09:57 +0100)
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: f8891461a277 ("mac80211: do not start any work during reconfigure flow")
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Reviewed-by: Johannes Berg <johannes.berg@intel.com>
Link: https://patch.msgid.link/20250306123626.1e02caf82640.I4949e71ed56e7186ed4968fa9ddff477473fa2f4@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
net/mac80211/util.c

index 7f02bd5891eb94645dd8efedce130086916690d2..fdda14c08e2b116b45176d06eb4c538cb5c99f84 100644 (file)
@@ -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,8 +2193,10 @@ int ieee80211_reconfig(struct ieee80211_local *local)
                ieee80211_reconfig_roc(local);
 
                /* Requeue all works */
-               list_for_each_entry(sdata, &local->interfaces, list)
-                       wiphy_work_queue(local->hw.wiphy, &sdata->work);
+               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,