Commit bf8ae352 authored by Ajith C's avatar Ajith C Committed by Long Li
Browse files

wifi: ath12k: fix firmware crash due to invalid peer nss 

stable inclusion
from stable-v6.6.50
commit 838c2cfdb6be7d7d8c06c711edf893eb34ca2e7c
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IAU9PY
CVE: CVE-2024-46827

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=tags/v6.6.51&id=838c2cfdb6be7d7d8c06c711edf893eb34ca2e7c



--------------------------------

[ Upstream commit db163a463bb93cd3e37e1e7b10b9726fb6f95857 ]

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: default avatarAjith C <quic_ajithc@quicinc.com>
Acked-by: default avatarJeff Johnson <quic_jjohnson@quicinc.com>
Signed-off-by: default avatarKalle Valo <quic_kvalo@quicinc.com>
Link: https://patch.msgid.link/20240613053528.2541645-1-quic_ajithc@quicinc.com


Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarLong Li <leo.lilong@huawei.com>
parent 02590a1a

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

+5 −0
Original line number Diff line number Diff line
@@ -3355,6 +3355,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",