summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorChristian Lamparter <chunkeey@googlemail.com>2010-10-16 18:49:15 +0200
committerJohn W. Linville <linville@tuxdriver.com>2010-10-25 14:43:13 -0400
commit5f4e6b2d3c74c1adda1cbfd9d9d30da22c7484fc (patch)
treeb6790e3f195491139d2af7642ef3f4f51408ca10 /net
parentcae7f953e8afa9b1ce234fd0907183b643cc5ab8 (diff)
downloadlinux-5f4e6b2d3c74c1adda1cbfd9d9d30da22c7484fc.tar.gz
linux-5f4e6b2d3c74c1adda1cbfd9d9d30da22c7484fc.tar.bz2
linux-5f4e6b2d3c74c1adda1cbfd9d9d30da22c7484fc.zip
mac80211: don't sanitize invalid rates
I found this bug while poking around with a pure-gn AP. Commit: cfg80211/mac80211: Use more generic bitrate mask for rate control Added some sanity checks to ensure that each tx rate index is included in the configured mask and it would change any rate indexes if it wasn't. But, the current implementation doesn't take into account that the invalid rate index "-1" has a special meaning (= no further attempts) and it should not be "changed". Signed-off-by: Christian Lamparter <chunkeey@googlemail.com> Cc: stable@kernel.org Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/rate.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/mac80211/rate.c b/net/mac80211/rate.c
index 809cf230d251..33f76993da08 100644
--- a/net/mac80211/rate.c
+++ b/net/mac80211/rate.c
@@ -329,6 +329,9 @@ void rate_control_get_rate(struct ieee80211_sub_if_data *sdata,
* if needed.
*/
for (i = 0; i < IEEE80211_TX_MAX_RATES; i++) {
+ /* Skip invalid rates */
+ if (info->control.rates[i].idx < 0)
+ break;
/* Rate masking supports only legacy rates for now */
if (info->control.rates[i].flags & IEEE80211_TX_RC_MCS)
continue;