Commit 045cfb71 authored by Lennert Buytenhek's avatar Lennert Buytenhek Committed by John W. Linville

mac80211: fix queue selection for packets injected via monitor interface

Commit 'mac80211: fix skb buffering issue' added an ->ndo_select_queue()
for monitor interfaces which can end up dereferencing ieee802_1d_to_ac[]
beyond the end of the array for injected data packets (as skb->priority
isn't guaranteed to be zero or within [0:7]), which then triggers the
WARN_ON in net/core/dev.c:dev_cap_txqueue().  Fix this by always setting
the priority to zero on injected data frames.
Signed-off-by: default avatarLennert Buytenhek <buytenh@marvell.com>
Cc: stable@kernel.org
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 8a5b33f5
...@@ -685,6 +685,7 @@ static u16 ieee80211_monitor_select_queue(struct net_device *dev, ...@@ -685,6 +685,7 @@ static u16 ieee80211_monitor_select_queue(struct net_device *dev,
return ieee802_1d_to_ac[skb->priority]; return ieee802_1d_to_ac[skb->priority];
} }
skb->priority = 0;
return ieee80211_downgrade_queue(local, skb); return ieee80211_downgrade_queue(local, skb);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment