nl80211: Fix possible Spectre-v1 for NL80211_TXRATE_HT

Use array_index_nospec() to sanitize ridx with respect to speculation.

Signed-off-by: Masashi Honma <masashi.honma@gmail.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Masashi Honma 2018-09-25 11:15:00 +09:00 committed by Johannes Berg
parent 0bcbf65184
commit 30fe6d50eb
1 changed files with 1 additions and 0 deletions

View File

@ -3756,6 +3756,7 @@ static bool ht_rateset_to_mask(struct ieee80211_supported_band *sband,
return false; return false;
/* check availability */ /* check availability */
ridx = array_index_nospec(ridx, IEEE80211_HT_MCS_MASK_LEN);
if (sband->ht_cap.mcs.rx_mask[ridx] & rbit) if (sband->ht_cap.mcs.rx_mask[ridx] & rbit)
mcs[ridx] |= rbit; mcs[ridx] |= rbit;
else else