From: Mikhail Limarenko Apply the same invalid-MCS hardening in monitor path status conversion to keep metadata handling consistent in both data and monitor pipelines. Tested-on: QCNFA765 (WCN785x), kernel 6.18.5+deb13-amd64 Signed-off-by: Mikhail Limarenko --- drivers/net/wireless/ath/ath12k/dp_mon.c | 38 ++++++++++++++---------- 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/drivers/net/wireless/ath/ath12k/dp_mon.c b/drivers/net/wireless/ath/ath12k/dp_mon.c index 009c495..6e894ef 100644 --- a/drivers/net/wireless/ath/ath12k/dp_mon.c +++ b/drivers/net/wireless/ath/ath12k/dp_mon.c @@ -1922,9 +1922,11 @@ ath12k_dp_mon_fill_rx_rate(struct ath12k *ar, case RX_MSDU_START_PKT_TYPE_11N: rx_status->encoding = RX_ENC_HT; if (rate_mcs > ATH12K_HT_MCS_MAX) { - ath12k_warn(ar->ab, - "Received with invalid mcs in HT mode %d\n", - rate_mcs); + dev_warn_ratelimited(ar->ab->dev, + "ath12k: invalid HT mcs %u in monitor path, forcing legacy rate metadata\n", + rate_mcs); + rx_status->encoding = RX_ENC_LEGACY; + rx_status->rate_idx = 0; break; } rx_status->rate_idx = rate_mcs + (8 * (nss - 1)); @@ -1933,35 +1935,41 @@ ath12k_dp_mon_fill_rx_rate(struct ath12k *ar, break; case RX_MSDU_START_PKT_TYPE_11AC: rx_status->encoding = RX_ENC_VHT; - rx_status->rate_idx = rate_mcs; if (rate_mcs > ATH12K_VHT_MCS_MAX) { - ath12k_warn(ar->ab, - "Received with invalid mcs in VHT mode %d\n", - rate_mcs); + dev_warn_ratelimited(ar->ab->dev, + "ath12k: invalid VHT mcs %u in monitor path, forcing legacy rate metadata\n", + rate_mcs); + rx_status->encoding = RX_ENC_LEGACY; + rx_status->rate_idx = 0; break; } + rx_status->rate_idx = rate_mcs; if (sgi) rx_status->enc_flags |= RX_ENC_FLAG_SHORT_GI; break; case RX_MSDU_START_PKT_TYPE_11AX: - rx_status->rate_idx = rate_mcs; if (rate_mcs > ATH12K_HE_MCS_MAX) { - ath12k_warn(ar->ab, - "Received with invalid mcs in HE mode %d\n", - rate_mcs); + dev_warn_ratelimited(ar->ab->dev, + "ath12k: invalid HE mcs %u in monitor path, forcing legacy rate metadata\n", + rate_mcs); + rx_status->encoding = RX_ENC_LEGACY; + rx_status->rate_idx = 0; break; } + rx_status->rate_idx = rate_mcs; rx_status->encoding = RX_ENC_HE; rx_status->he_gi = ath12k_he_gi_to_nl80211_he_gi(sgi); break; case RX_MSDU_START_PKT_TYPE_11BE: - rx_status->rate_idx = rate_mcs; if (rate_mcs > ATH12K_EHT_MCS_MAX) { - ath12k_warn(ar->ab, - "Received with invalid mcs in EHT mode %d\n", - rate_mcs); + dev_warn_ratelimited(ar->ab->dev, + "ath12k: invalid EHT mcs %u in monitor path, forcing legacy rate metadata\n", + rate_mcs); + rx_status->encoding = RX_ENC_LEGACY; + rx_status->rate_idx = 0; break; } + rx_status->rate_idx = rate_mcs; rx_status->encoding = RX_ENC_EHT; rx_status->he_gi = ath12k_he_gi_to_nl80211_he_gi(sgi); break; -- 2.47.3