Skip to content

Commit 6285516

Browse files
Maharaja Kennadyrajangregkh
authored andcommitted
wifi: ath12k: fix node corruption in ar->arvifs list
[ Upstream commit 823435b ] In current WLAN recovery code flow, ath12k_core_halt() only reinitializes the "arvifs" list head. This will cause the list node immediately following the list head to become an invalid list node. Because the prev of that node still points to the list head "arvifs", but the next of the list head "arvifs" no longer points to that list node. When a WLAN recovery occurs during the execution of a vif removal, and it happens before the spin_lock_bh(&ar->data_lock) in ath12k_mac_vdev_delete(), list_del() will detect the previously mentioned situation, thereby triggering a kernel panic. The fix is to remove and reinitialize all vif list nodes from the list head "arvifs" during WLAN halt. The reinitialization is to make the list nodes valid, ensuring that the list_del() in ath12k_mac_vdev_delete() can execute normally. Call trace: __list_del_entry_valid_or_report+0xd4/0x100 (P) ath12k_mac_remove_link_interface.isra.0+0xf8/0x2e4 [ath12k] ath12k_scan_vdev_clean_work+0x40/0x164 [ath12k] cfg80211_wiphy_work+0xfc/0x100 process_one_work+0x164/0x2d0 worker_thread+0x254/0x380 kthread+0xfc/0x100 ret_from_fork+0x10/0x20 The change is mostly copied from the ath11k patch: https://lore.kernel.org/all/20250320053145.3445187-1-quic_stonez@quicinc.com/ Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.4.1-00199-QCAHKSWPL_SILICONZ-1 Fixes: d889913 ("wifi: ath12k: driver for Qualcomm Wi-Fi 7 devices") Signed-off-by: Maharaja Kennadyrajan <maharaja.kennadyrajan@oss.qualcomm.com> Reviewed-by: Vasanthakumar Thiagarajan <vasanthakumar.thiagarajan@oss.qualcomm.com> Link: https://patch.msgid.link/20250416021724.2162519-1-maharaja.kennadyrajan@oss.qualcomm.com Signed-off-by: Jeff Johnson <jeff.johnson@oss.qualcomm.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 6a6307f commit 6285516

File tree

1 file changed

+7
-1
lines changed
  • drivers/net/wireless/ath/ath12k

1 file changed

+7
-1
lines changed

drivers/net/wireless/ath/ath12k/core.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1004,6 +1004,7 @@ static void ath12k_rfkill_work(struct work_struct *work)
10041004

10051005
void ath12k_core_halt(struct ath12k *ar)
10061006
{
1007+
struct list_head *pos, *n;
10071008
struct ath12k_base *ab = ar->ab;
10081009

10091010
lockdep_assert_held(&ar->conf_mutex);
@@ -1019,7 +1020,12 @@ void ath12k_core_halt(struct ath12k *ar)
10191020

10201021
rcu_assign_pointer(ab->pdevs_active[ar->pdev_idx], NULL);
10211022
synchronize_rcu();
1022-
INIT_LIST_HEAD(&ar->arvifs);
1023+
1024+
spin_lock_bh(&ar->data_lock);
1025+
list_for_each_safe(pos, n, &ar->arvifs)
1026+
list_del_init(pos);
1027+
spin_unlock_bh(&ar->data_lock);
1028+
10231029
idr_init(&ar->txmgmt_idr);
10241030
}
10251031

0 commit comments

Comments
 (0)