ath12k_mac_mlo_sta_set_link_active() fills the vdev_bitmap and inactive_vdev_bitmap arrays of struct wmi_mlo_link_set_active_arg, and both arrays are sized by WMI_MLO_VDEV_BITMAP_SZ. The bounds checks on entry_idx, however, compared against WMI_MLO_LINK_NUM_SZ, which is the size of link_num[]. Both constants are 2 today, so nothing changes at runtime. The check still has to match the array it guards: if the constants ever diverge, the wrong bound either rejects valid vdev IDs or allows writes past the end of the bitmap arrays. Use WMI_MLO_VDEV_BITMAP_SZ in both the active and the inactive vdev checks. Tested-on: QCC2072 hw1.0 PCI WLAN.COL.1.0.c2-00277-QCACOLSWPL_V1_TO_SILICONZ-1 Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.1.c7-00108-QCAHMTSWPL_V1.0_V2.0_SILICONZ_UPSTREAM-3 Signed-off-by: Miaoqing Pan --- drivers/net/wireless/ath/ath12k/mac.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/ath/ath12k/mac.c b/drivers/net/wireless/ath/ath12k/mac.c index f57d4ef413e8..dfb0f6e678ac 100644 --- a/drivers/net/wireless/ath/ath12k/mac.c +++ b/drivers/net/wireless/ath/ath12k/mac.c @@ -7605,7 +7605,7 @@ static int ath12k_mac_mlo_sta_set_link_active(struct ath12k_base *ab, vdev_id = mlo_vdev_id_lst[vdev_idx]; entry_idx = vdev_id / 32; entry_offset = vdev_id % 32; - if (entry_idx >= WMI_MLO_LINK_NUM_SZ) { + if (entry_idx >= WMI_MLO_VDEV_BITMAP_SZ) { ath12k_warn(ab, "Invalid entry_idx %d num_mlo_vdev %d vdev %d", entry_idx, num_mlo_vdev, vdev_id); return -EINVAL; @@ -7625,7 +7625,7 @@ static int ath12k_mac_mlo_sta_set_link_active(struct ath12k_base *ab, vdev_id = mlo_inactive_vdev_lst[vdev_idx]; entry_idx = vdev_id / 32; entry_offset = vdev_id % 32; - if (entry_idx >= WMI_MLO_LINK_NUM_SZ) { + if (entry_idx >= WMI_MLO_VDEV_BITMAP_SZ) { ath12k_warn(ab, "Invalid entry_idx %d num_mlo_vdev %d vdev %d", entry_idx, num_mlo_inactive_vdev, vdev_id); return -EINVAL; -- 2.34.1