diff options
| author | Masashi Honma <masashi.honma@gmail.com> | 2018-09-25 11:15:00 +0900 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-11-04 14:52:38 +0100 |
| commit | c7b66583c9edb63ab7613a6ff545367175f95125 (patch) | |
| tree | dbd879657bb310d2aff1cd8d907ca6200df3d5a8 /net/wireless | |
| parent | fa1578ec411d8cf9724166738fd41fc5b686e28e (diff) | |
nl80211: Fix possible Spectre-v1 for NL80211_TXRATE_HT
[ Upstream commit 30fe6d50eb088783c8729c7d930f65296b2b3fa7 ]
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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'net/wireless')
| -rw-r--r-- | net/wireless/nl80211.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 3de415bca391..5e7c9b361e8a 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -3480,6 +3480,7 @@ static bool ht_rateset_to_mask(struct ieee80211_supported_band *sband, return false; /* check availability */ + ridx = array_index_nospec(ridx, IEEE80211_HT_MCS_MASK_LEN); if (sband->ht_cap.mcs.rx_mask[ridx] & rbit) mcs[ridx] |= rbit; else |