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.14.79~124
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c7b66583c9edb63ab7613a6ff545367175f95125;p=platform%2Fkernel%2Flinux-exynos.git

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

diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 3de415b..5e7c9b3 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