Skip to content
This repository was archived by the owner on Dec 20, 2023. It is now read-only.

Commit c7abf25

Browse files
Karl Beldanjmberg-intel
authored andcommitted
mac80211: fix typo in starting baserate for rts_cts_rate_idx
It affects non-(V)HT rates and can lead to selecting an rts_cts rate that is not a basic rate or way superior to the reference rate (ATM rates[0] used for the 1st attempt of the protected frame data). E.g, assuming drivers register growing (bitrate) sorted tables of ieee80211_rate-s, having : - rates[0].idx == d'2 and basic_rates == b'10100 will select rts_cts idx b'10011 & ~d'(BIT(2)-1), i.e. 1, likewise - rates[0].idx == d'2 and basic_rates == b'10001 will select rts_cts idx b'10000 The first is not a basic rate and the second is > rates[0]. Also, wrt severity of the addressed misbehavior, ATM we only have one rts_cts_rate_idx rather than one per rate table entry, so this idx might still point to bitrates > rates[1..MAX_RATES]. Fixes: 5253ffb ("mac80211: always pick a basic rate to tx RTS/CTS for pre-HT rates") Cc: stable@vger.kernel.org Signed-off-by: Karl Beldan <karl.beldan@rivierawaves.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
1 parent 252e07c commit c7abf25

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

net/mac80211/rate.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,7 @@ static void rate_fixup_ratelist(struct ieee80211_vif *vif,
448448
*/
449449
if (!(rates[0].flags & IEEE80211_TX_RC_MCS)) {
450450
u32 basic_rates = vif->bss_conf.basic_rates;
451-
s8 baserate = basic_rates ? ffs(basic_rates - 1) : 0;
451+
s8 baserate = basic_rates ? ffs(basic_rates) - 1 : 0;
452452

453453
rate = &sband->bitrates[rates[0].idx];
454454

0 commit comments

Comments
 (0)