| From 0cb16757d693d927ba4979a9cd0fa5295f3ed8c2 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Sun, 25 May 2025 16:45:24 +0200 |
| Subject: wifi: iwlegacy: Check rate_idx range after addition |
| |
| From: Stanislaw Gruszka <stf_xl@wp.pl> |
| |
| [ Upstream commit 0de19d5ae0b2c5b18b88c5c7f0442f707a207409 ] |
| |
| Limit rate_idx to IL_LAST_OFDM_RATE for 5GHz band for thinkable case |
| the index is incorrect. |
| |
| Reported-by: Fedor Pchelkin <pchelkin@ispras.ru> |
| Reported-by: Alexei Safin <a.safin@rosa.ru> |
| Signed-off-by: Stanislaw Gruszka <stf_xl@wp.pl> |
| Reviewed-by: Fedor Pchelkin <pchelkin@ispras.ru> |
| Link: https://patch.msgid.link/20250525144524.GA172583@wp.pl |
| Signed-off-by: Johannes Berg <johannes.berg@intel.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/net/wireless/intel/iwlegacy/4965-mac.c | 5 ++++- |
| 1 file changed, 4 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/net/wireless/intel/iwlegacy/4965-mac.c b/drivers/net/wireless/intel/iwlegacy/4965-mac.c |
| index 78dee8ccfebf..1c22a29d20d6 100644 |
| --- a/drivers/net/wireless/intel/iwlegacy/4965-mac.c |
| +++ b/drivers/net/wireless/intel/iwlegacy/4965-mac.c |
| @@ -1575,8 +1575,11 @@ il4965_tx_cmd_build_rate(struct il_priv *il, |
| || rate_idx > RATE_COUNT_LEGACY) |
| rate_idx = rate_lowest_index(&il->bands[info->band], sta); |
| /* For 5 GHZ band, remap mac80211 rate indices into driver indices */ |
| - if (info->band == NL80211_BAND_5GHZ) |
| + if (info->band == NL80211_BAND_5GHZ) { |
| rate_idx += IL_FIRST_OFDM_RATE; |
| + if (rate_idx > IL_LAST_OFDM_RATE) |
| + rate_idx = IL_LAST_OFDM_RATE; |
| + } |
| /* Get PLCP rate for tx_cmd->rate_n_flags */ |
| rate_plcp = il_rates[rate_idx].plcp; |
| /* Zero out flags for this packet */ |
| -- |
| 2.39.5 |
| |
