From: Masashi Honma <masashi.honma@gmail.com>
Date: Tue, 25 Sep 2018 02:15:00 +0000 (+0900)
Subject: nl80211: Fix possible Spectre-v1 for NL80211_TXRATE_HT
X-Git-Tag: v4.19-rc7~28^2~33^2~4
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=30fe6d50eb088783c8729c7d930f65296b2b3fa7;p=users%2Fjedix%2Flinux-maple.git

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>
---

diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 4b8ec659e797..bd26230de63e 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -3756,6 +3756,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