Skip to content

Commit 36670b6

Browse files
Rameshkumar Sundaramjeff-t-johnson
Rameshkumar Sundaram
authored and
jeff-t-johnson
committed
wifi: ath12k: Avoid accessing uninitialized arvif->ar during beacon miss
During beacon miss handling, ath12k driver iterates over active virtual interfaces (vifs) and attempts to access the radio object (ar) via arvif->deflink->ar. However, after commit aa80f12 ("wifi: ath12k: defer vdev creation for MLO"), arvif is linked to a radio only after vdev creation, typically when a channel is assigned or a scan is requested. For P2P capable devices, a default P2P interface is created by wpa_supplicant along with regular station interfaces, these serve as dummy interfaces for P2P-capable stations, lack an associated netdev and initiate frequent scans to discover neighbor p2p devices. When a scan is initiated on such P2P vifs, driver selects destination radio (ar) based on scan frequency, creates a scan vdev, and attaches arvif to the radio. Once the scan completes or is aborted, the scan vdev is deleted, detaching arvif from the radio and leaving arvif->ar uninitialized. While handling beacon miss for station interfaces, P2P interface is also encountered in the vif iteration and ath12k_mac_handle_beacon_miss_iter() tries to dereference the uninitialized arvif->deflink->ar. Fix this by verifying that vdev is created for the arvif before accessing its ar during beacon miss handling and similar vif iterator callbacks. ========================================================================== wlp6s0: detected beacon loss from AP (missed 7 beacons) - probing KASAN: null-ptr-deref in range [0x0000000000000010-0x0000000000000017] CPU: 5 UID: 0 PID: 0 Comm: swapper/5 Not tainted 6.16.0-rc1-wt-ath+ #2 PREEMPT(full) RIP: 0010:ath12k_mac_handle_beacon_miss_iter+0xb5/0x1a0 [ath12k] Call Trace: __iterate_interfaces+0x11a/0x410 [mac80211] ieee80211_iterate_active_interfaces_atomic+0x61/0x140 [mac80211] ath12k_mac_handle_beacon_miss+0xa1/0xf0 [ath12k] ath12k_roam_event+0x393/0x560 [ath12k] ath12k_wmi_op_rx+0x1486/0x28c0 [ath12k] ath12k_htc_process_trailer.isra.0+0x2fb/0x620 [ath12k] ath12k_htc_rx_completion_handler+0x448/0x830 [ath12k] ath12k_ce_recv_process_cb+0x549/0x9e0 [ath12k] ath12k_ce_per_engine_service+0xbe/0xf0 [ath12k] ath12k_pci_ce_workqueue+0x69/0x120 [ath12k] process_one_work+0xe3a/0x1430 Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.4.1-00199-QCAHKSWPL_SILICONZ-1 Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.1.c5-00284.1-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3 Fixes: aa80f12 ("wifi: ath12k: defer vdev creation for MLO") Signed-off-by: Rameshkumar Sundaram <[email protected]> Reviewed-by: Vasanthakumar Thiagarajan <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Jeff Johnson <[email protected]>
1 parent 757259d commit 36670b6

File tree

2 files changed

+11
-7
lines changed

2 files changed

+11
-7
lines changed

‎drivers/net/wireless/ath/ath12k/mac.c‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -693,6 +693,9 @@ static void ath12k_get_arvif_iter(void *data, u8 *mac,
693693
if (WARN_ON(!arvif))
694694
continue;
695695

696+
if (!arvif->is_created)
697+
continue;
698+
696699
if (arvif->vdev_id == arvif_iter->vdev_id &&
697700
arvif->ar == arvif_iter->ar) {
698701
arvif_iter->arvif = arvif;
@@ -1755,7 +1758,7 @@ static void ath12k_mac_handle_beacon_iter(void *data, u8 *mac,
17551758
struct ath12k_vif *ahvif = ath12k_vif_to_ahvif(vif);
17561759
struct ath12k_link_vif *arvif = &ahvif->deflink;
17571760

1758-
if (vif->type != NL80211_IFTYPE_STATION)
1761+
if (vif->type != NL80211_IFTYPE_STATION || !arvif->is_created)
17591762
return;
17601763

17611764
if (!ether_addr_equal(mgmt->bssid, vif->bss_conf.bssid))
@@ -1778,16 +1781,16 @@ static void ath12k_mac_handle_beacon_miss_iter(void *data, u8 *mac,
17781781
u32 *vdev_id = data;
17791782
struct ath12k_vif *ahvif = ath12k_vif_to_ahvif(vif);
17801783
struct ath12k_link_vif *arvif = &ahvif->deflink;
1781-
struct ath12k *ar = arvif->ar;
1782-
struct ieee80211_hw *hw = ath12k_ar_to_hw(ar);
1784+
struct ieee80211_hw *hw;
17831785

1784-
if (arvif->vdev_id != *vdev_id)
1786+
if (!arvif->is_created || arvif->vdev_id != *vdev_id)
17851787
return;
17861788

17871789
if (!arvif->is_up)
17881790
return;
17891791

17901792
ieee80211_beacon_loss(vif);
1793+
hw = ath12k_ar_to_hw(arvif->ar);
17911794

17921795
/* Firmware doesn't report beacon loss events repeatedly. If AP probe
17931796
* (done by mac80211) succeeds but beacons do not resume then it
@@ -9818,7 +9821,7 @@ ath12k_mac_change_chanctx_cnt_iter(void *data, u8 *mac,
98189821
if (WARN_ON(!arvif))
98199822
continue;
98209823

9821-
if (arvif->ar != arg->ar)
9824+
if (!arvif->is_created || arvif->ar != arg->ar)
98229825
continue;
98239826

98249827
link_conf = wiphy_dereference(ahvif->ah->hw->wiphy,
@@ -9853,7 +9856,7 @@ ath12k_mac_change_chanctx_fill_iter(void *data, u8 *mac,
98539856
if (WARN_ON(!arvif))
98549857
continue;
98559858

9856-
if (arvif->ar != arg->ar)
9859+
if (!arvif->is_created || arvif->ar != arg->ar)
98579860
continue;
98589861

98599862
link_conf = wiphy_dereference(ahvif->ah->hw->wiphy,

‎drivers/net/wireless/ath/ath12k/p2p.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// SPDX-License-Identifier: BSD-3-Clause-Clear
22
/*
33
* Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
4+
* Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
45
*/
56

67
#include <net/mac80211.h>
@@ -124,7 +125,7 @@ static void ath12k_p2p_noa_update_vdev_iter(void *data, u8 *mac,
124125

125126
WARN_ON(!rcu_read_lock_any_held());
126127
arvif = &ahvif->deflink;
127-
if (arvif->ar != arg->ar || arvif->vdev_id != arg->vdev_id)
128+
if (!arvif->is_created || arvif->ar != arg->ar || arvif->vdev_id != arg->vdev_id)
128129
return;
129130

130131
ath12k_p2p_noa_update(arvif, arg->noa);

0 commit comments

Comments
 (0)