hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

iwlwifi: mvm: rs: fix mapping from HT/VHT rates to legacy 

The table rs_ht_to_legacy is used to get the next legacy rate
following the last HT or VHT rate in the LQ rates table.
The mapping wasn't correct as well as didn't include entries
for MCS8/9 which led to out of bounds access. This didn't
trigger a crash but led to legacy rate entries using 1Mbps
rate.
In 5Ghz this probably caused the Tx to fail completely given
that Tx attempt would have reached the legacy entries and 1Mbps
isn't valid.

Signed-off-by: Eyal Shapira <eyal@wizery.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
This commit is contained in:
Eyal Shapira 2013-11-28 12:27:03 +02:00 committed by Emmanuel Grumbach
parent 809bccfa31
commit da87d7d5e7
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/net/wireless/iwlwifi/mvm/rs.c
View File

@ -56,19 +56,16 @@
static u8 rs_ht_to_legacy[] = {
[IWL_RATE_1M_INDEX] = IWL_RATE_6M_INDEX,
[IWL_RATE_2M_INDEX] = IWL_RATE_6M_INDEX,
[IWL_RATE_5M_INDEX] = IWL_RATE_6M_INDEX,
[IWL_RATE_11M_INDEX] = IWL_RATE_6M_INDEX,
[IWL_RATE_6M_INDEX] = IWL_RATE_6M_INDEX,
[IWL_RATE_9M_INDEX] = IWL_RATE_6M_INDEX,
[IWL_RATE_12M_INDEX] = IWL_RATE_9M_INDEX,
[IWL_RATE_18M_INDEX] = IWL_RATE_12M_INDEX,
[IWL_RATE_24M_INDEX] = IWL_RATE_18M_INDEX,
[IWL_RATE_36M_INDEX] = IWL_RATE_24M_INDEX,
[IWL_RATE_48M_INDEX] = IWL_RATE_36M_INDEX,
[IWL_RATE_54M_INDEX] = IWL_RATE_48M_INDEX,
[IWL_RATE_60M_INDEX] = IWL_RATE_54M_INDEX,
[IWL_RATE_MCS_0_INDEX] = IWL_RATE_6M_INDEX,
[IWL_RATE_MCS_1_INDEX] = IWL_RATE_9M_INDEX,
[IWL_RATE_MCS_2_INDEX] = IWL_RATE_12M_INDEX,
[IWL_RATE_MCS_3_INDEX] = IWL_RATE_18M_INDEX,
[IWL_RATE_MCS_4_INDEX] = IWL_RATE_24M_INDEX,
[IWL_RATE_MCS_5_INDEX] = IWL_RATE_36M_INDEX,
[IWL_RATE_MCS_6_INDEX] = IWL_RATE_48M_INDEX,
[IWL_RATE_MCS_7_INDEX] = IWL_RATE_54M_INDEX,
[IWL_RATE_MCS_8_INDEX] = IWL_RATE_54M_INDEX,
[IWL_RATE_MCS_9_INDEX] = IWL_RATE_54M_INDEX,
};
static const u8 ant_toggle_lookup[] = {
@ -682,6 +679,8 @@ static u32 rs_get_lower_rate(struct iwl_lq_sta *lq_sta,
* are always supported (spec demand) */
if (!is_legacy(rate) && (!ht_possible || !scale_index)) {
switch_to_legacy = 1;
WARN_ON_ONCE(scale_index < IWL_RATE_MCS_0_INDEX &&
scale_index > IWL_RATE_MCS_9_INDEX);
scale_index = rs_ht_to_legacy[scale_index];
if (lq_sta->band == IEEE80211_BAND_5GHZ)
rate->type = LQ_LEGACY_A;