mac80211: off by one in mcs mask handling

PATCH New Dan Carpenter 1 participant 1 message Feb 1, 2012

Subsystems (3)

Kernel janitors mac80211 802.11 (including cfg80211/NL80211)

lore

Share & tools

lore

Dan Carpenter

author

2012-02-01 07:42 UTC #0 lore raw

PATCH 1/1 mac80211: off by one in mcs mask handling

"ridx" is used as an index into the mcs_mask[] array which has IEEE80211_HT_MCS_MASK_LEN elements.

Signed-off-by Dan Carpenter <[email protected]>

net/mac80211/rate.c +1 -1

index 3fef26d..22fc28e 100644
@@ -324,7 +324,7 @@ static bool rate_idx_match_mcs_mask(struct ieee80211_tx_rate *rate,
 	rbit = rate->idx % 8;
 
 	/* sanity check */
-	if (ridx < 0 || ridx > IEEE80211_HT_MCS_MASK_LEN)
+	if (ridx < 0 || ridx >= IEEE80211_HT_MCS_MASK_LEN)
 		return false;
 
 	/* See whether the selected rate or anything below it is allowed. */

net/wireless/nl80211.c +1 -1

index c910b07..7db14b4 100644
@@ -5408,7 +5408,7 @@ static bool ht_rateset_to_mask(struct ieee80211_supported_band *sband,
 		rbit = BIT(rates[i] % 8);
 
 		/* check validity */
-		if ((ridx < 0) || (ridx > IEEE80211_HT_MCS_MASK_LEN))
+		if ((ridx < 0) || (ridx >= IEEE80211_HT_MCS_MASK_LEN))
 			return false;
 
 		/* check availability */