wifi: iwlwifi: mld: assume wiphy is locked when getting BSS ifaces

benzea · jmberg-intel · commit 8d006c92132e · 2025-03-11T16:29:24.000+01:00
The code was calling ieee80211_iterate_interfaces, however that takes a lock of iflist_mtx, which must not be taken recursively. Fix this by using the appropriate _mtx version that asserts that the wiphy mutex is already held. Signed-off-by: Benjamin Berg <benjamin.berg@intel.com> Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com> Link: https://patch.msgid.link/20250309073442.6ce298d6a44f.Ibc862dfdd6cb2da63781c791b9dc601bd5ce4bdc@changeid Signed-off-by: Johannes Berg <johannes.berg@intel.com>
diff --git a/drivers/net/wireless/intel/iwlwifi/mld/iface.c b/drivers/net/wireless/intel/iwlwifi/mld/iface.c
@@ -465,10 +465,10 @@ u8 iwl_mld_get_fw_bss_vifs_ids(struct iwl_mld *mld)
 {
 	u8 fw_id_bitmap = 0;
 
-	ieee80211_iterate_interfaces(mld->hw,
-				     IEEE80211_IFACE_SKIP_SDATA_NOT_IN_DRIVER,
-				     iwl_mld_get_fw_id_bss_bitmap_iter,
-				     &fw_id_bitmap);
+	ieee80211_iterate_active_interfaces_mtx(mld->hw,
+						IEEE80211_IFACE_SKIP_SDATA_NOT_IN_DRIVER,
+						iwl_mld_get_fw_id_bss_bitmap_iter,
+						&fw_id_bitmap);
 
 	return fw_id_bitmap;
 }

Original file line number	Diff line number	Diff line change
`@@ -465,10 +465,10 @@ u8 iwl_mld_get_fw_bss_vifs_ids(struct iwl_mld *mld)`
`465`	`465`	`{`
`466`	`466`	`u8 fw_id_bitmap = 0;`
`467`	`467`
`468`		`- ieee80211_iterate_interfaces(mld->hw,`
`469`		`- IEEE80211_IFACE_SKIP_SDATA_NOT_IN_DRIVER,`
`470`		`- iwl_mld_get_fw_id_bss_bitmap_iter,`
`471`		`- &fw_id_bitmap);`
	`468`	`+ ieee80211_iterate_active_interfaces_mtx(mld->hw,`
	`469`	`+ IEEE80211_IFACE_SKIP_SDATA_NOT_IN_DRIVER,`
	`470`	`+ iwl_mld_get_fw_id_bss_bitmap_iter,`
	`471`	`+ &fw_id_bitmap);`
`472`	`472`
`473`	`473`	`return fw_id_bitmap;`
`474`	`474`	`}`