]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
wifi: rtw89: chan: fix soft lockup in rtw89_entity_recalc_mgnt_roles()
authorZong-Zhe Yang <kevin_yang@realtek.com>
Tue, 31 Dec 2024 00:48:09 +0000 (08:48 +0800)
committerPing-Ke Shih <pkshih@realtek.com>
Sun, 12 Jan 2025 01:12:20 +0000 (09:12 +0800)
During rtw89_entity_recalc_mgnt_roles(), there is a normalizing process
which will re-order the list if an entry with target pattern is found.
And once one is found, should have aborted the list_for_each_entry. But,
`break` just aborted the inner for-loop. The outer list_for_each_entry
still continues. Normally, only the first entry will match the target
pattern, and the re-ordering will change nothing, so there won't be
soft lockup. However, in some special cases, soft lockup would happen.

Fix it by `goto fill` to break from the list_for_each_entry.

The following is a sample of kernel log for this problem.

watchdog: BUG: soft lockup - CPU#1 stuck for 26s! [wpa_supplicant:2055]
[...]
RIP: 0010:rtw89_entity_recalc ([...] chan.c:392 chan.c:479) rtw89_core
[...]

Fixes: 68ec751b2881 ("wifi: rtw89: chan: manage active interfaces")
Signed-off-by: Zong-Zhe Yang <kevin_yang@realtek.com>
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Link: https://patch.msgid.link/20241231004811.8646-3-pkshih@realtek.com
drivers/net/wireless/realtek/rtw89/chan.c

index abc78716596d003a7d8cf8fda8c6fce91edbbedd..c06d305519df46912e76bcff63b9317c5c42ff72 100644 (file)
@@ -391,11 +391,12 @@ static void rtw89_entity_recalc_mgnt_roles(struct rtw89_dev *rtwdev)
 
                                list_del(&role->mgnt_entry);
                                list_add(&role->mgnt_entry, &mgnt->active_list);
-                               break;
+                               goto fill;
                        }
                }
        }
 
+fill:
        list_for_each_entry(role, &mgnt->active_list, mgnt_entry) {
                if (unlikely(pos >= RTW89_MAX_INTERFACE_NUM)) {
                        rtw89_warn(rtwdev,