aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorChristian Lamparter <chunkeey@googlemail.com>2012-07-07 15:07:13 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-08-09 08:22:52 -0700
commitb8e69df8d54f9458b38aee32a66ac82e3eaf2a6c (patch)
treedf775c114b4f13e2fb38007cf9da048d0e4e4dfe /net
parent77a797164fa64308ead7da0b1898895979f10b15 (diff)
mac80211: fix read outside array bounds
commit 353d09c6ceedc1cb0c54fe5002c0ca80b6ee6e4f upstream. ieee802_1d_to_ac is defined as a const int[8], but the tid parameter has a range from 0 to 15. Signed-off-by: Christian Lamparter <chunkeey@googlemail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/tx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index e453212fa17..85cf32d2f7b 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -2733,7 +2733,7 @@ EXPORT_SYMBOL(ieee80211_get_buffered_bc);
void ieee80211_tx_skb_tid(struct ieee80211_sub_if_data *sdata,
struct sk_buff *skb, int tid)
{
- int ac = ieee802_1d_to_ac[tid];
+ int ac = ieee802_1d_to_ac[tid & 7];
skb_set_mac_header(skb, 0);
skb_set_network_header(skb, 0);