]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
wifi: ath12k: fix firmware crash due to invalid peer nss
authorAjith C <quic_ajithc@quicinc.com>
Thu, 13 Jun 2024 05:35:28 +0000 (11:05 +0530)
committerKalle Valo <quic_kvalo@quicinc.com>
Wed, 19 Jun 2024 14:18:57 +0000 (17:18 +0300)
Currently, if the access point receives an association
request containing an Extended HE Capabilities Information
Element with an invalid MCS-NSS, it triggers a firmware
crash.

This issue arises when EHT-PHY capabilities shows support
for a bandwidth and MCS-NSS set for that particular
bandwidth is filled by zeros and due to this, driver obtains
peer_nss as 0 and sending this value to firmware causes
crash.

Address this issue by implementing a validation step for
the peer_nss value before passing it to the firmware. If
the value is greater than zero, proceed with forwarding
it to the firmware. However, if the value is invalid,
reject the association request to prevent potential
firmware crashes.

Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.0.1-00029-QCAHKSWPL_SILICONZ-1

Signed-off-by: Ajith C <quic_ajithc@quicinc.com>
Acked-by: Jeff Johnson <quic_jjohnson@quicinc.com>
Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
Link: https://patch.msgid.link/20240613053528.2541645-1-quic_ajithc@quicinc.com
drivers/net/wireless/ath/ath12k/mac.c

index af19870eb8c05c5261a185b5b98cc58835715ee4..f9caed8ffd632cd5860df00ba208578855eb02f6 100644 (file)
@@ -4092,6 +4092,11 @@ static int ath12k_station_assoc(struct ath12k *ar,
 
        ath12k_peer_assoc_prepare(ar, vif, sta, &peer_arg, reassoc);
 
+       if (peer_arg.peer_nss < 1) {
+               ath12k_warn(ar->ab,
+                           "invalid peer NSS %d\n", peer_arg.peer_nss);
+               return -EINVAL;
+       }
        ret = ath12k_wmi_send_peer_assoc_cmd(ar, &peer_arg);
        if (ret) {
                ath12k_warn(ar->ab, "failed to run peer assoc for STA %pM vdev %i: %d\n",