domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mac80211: fix NULL pointer crash in monitor frame injection TX path

Browse Source 
This "patch to the patch" fixes a NULL pointer derefence crash in the new
intermediate software queues. The crash can be reproduced by injecting an
802.11 frame with a BSSID that does not belong to a configured vif. The
wperf tool (https://github.com/anyfi/wperf) may be convenient for doing
this.

Signed-off-by: Johan Almbladh <ja@anyfi.net>

SVN-Revision: 44220
This commit is contained in:
John Crispin
2015-01-30 08:06:28 +00:00
parent 539cd23892
commit b86545c86d
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package/kernel/mac80211/patches/321-mac80211-add-an-intermediate-software-queue-implemen.patch
View File

@@ -384,7 +384,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+ if (pubsta) { + if (pubsta) {
+ u8 tid = skb->priority & IEEE80211_QOS_CTL_TID_MASK; + u8 tid = skb->priority & IEEE80211_QOS_CTL_TID_MASK;
+ pubtxq = pubsta->txq[tid]; + pubtxq = pubsta->txq[tid];
+ } else { + } else if (vif) {
+ pubtxq = vif->txq; + pubtxq = vif->txq;
+ } + }
+ +