Commit 763216fe authored by P Praneesh's avatar P Praneesh Committed by Jeff Johnson
Browse files

wifi: ath12k: Add MSDU length validation for TKIP MIC error 



In the WBM error path, while processing TKIP MIC errors, MSDU length
is fetched from the hal_rx_desc's msdu_end. This MSDU length is
directly passed to skb_put() without validation. In stress test
scenarios, the WBM error ring may receive invalid descriptors, which
could lead to an invalid MSDU length.

To fix this, add a check to drop the skb when the calculated MSDU
length is greater than the skb size.

Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.3.1-00173-QCAHKSWPL_SILICONZ-1
Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3

Fixes: d8899132 ("wifi: ath12k: driver for Qualcomm Wi-Fi 7 devices")
Signed-off-by: default avatarP Praneesh <quic_ppranees@quicinc.com>
Signed-off-by: default avatarNithyanantham Paramasivam <nithyanantham.paramasivam@oss.qualcomm.com>
Reviewed-by: default avatarVasanthakumar Thiagarajan <vasanthakumar.thiagarajan@oss.qualcomm.com>
Link: https://patch.msgid.link/20250416021903.3178962-1-nithyanantham.paramasivam@oss.qualcomm.com


Signed-off-by: default avatarJeff Johnson <jeff.johnson@oss.qualcomm.com>
parent 9f17747f

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

+9 −0
Original line number Diff line number Diff line
@@ -3876,6 +3876,15 @@ static bool ath12k_dp_rx_h_tkip_mic_err(struct ath12k *ar, struct sk_buff *msdu, 


	l3pad_bytes = ath12k_dp_rx_h_l3pad(ab, desc);

	msdu_len = ath12k_dp_rx_h_msdu_len(ab, desc);



	if ((hal_rx_desc_sz + l3pad_bytes + msdu_len) > DP_RX_BUFFER_SIZE) {

		ath12k_dbg(ab, ATH12K_DBG_DATA,

			   "invalid msdu len in tkip mic err %u\n", msdu_len);

		ath12k_dbg_dump(ab, ATH12K_DBG_DATA, NULL, "", desc,

				sizeof(*desc));

		return true;

	}



	skb_put(msdu, hal_rx_desc_sz + l3pad_bytes + msdu_len);

	skb_pull(msdu, hal_rx_desc_sz + l3pad_bytes);