[openwrt/openwrt] mac80211: do not drop tx nulldata packets on encrypted links

[LEDE Commits]

nbd pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/3ab695368a5c8dc6228055bd05bd05f1974d818c

commit 3ab695368a5c8dc6228055bd05bd05f1974d818c
Author: Felix Fietkau <nbd at nbd.name>
AuthorDate: Fri Dec 18 22:58:10 2020 +0100

    mac80211: do not drop tx nulldata packets on encrypted links
    
    Fixes sending out nulldata probing frames
    
    Signed-off-by: Felix Fietkau <nbd at nbd.name>
---
 ...-not-drop-tx-nulldata-packets-on-encrypte.patch | 25 ++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/package/kernel/mac80211/patches/subsys/336-mac80211-do-not-drop-tx-nulldata-packets-on-encrypte.patch b/package/kernel/mac80211/patches/subsys/336-mac80211-do-not-drop-tx-nulldata-packets-on-encrypte.patch
new file mode 100644
index 0000000000..378c37455d
--- /dev/null
+++ b/package/kernel/mac80211/patches/subsys/336-mac80211-do-not-drop-tx-nulldata-packets-on-encrypte.patch
@@ -0,0 +1,25 @@
+From: Felix Fietkau <nbd at nbd.name>
+Date: Fri, 18 Dec 2020 20:08:06 +0100
+Subject: [PATCH] mac80211: do not drop tx nulldata packets on encrypted links
+
+ieee80211_tx_h_select_key drops any non-mgmt packets without a key when
+encryption is used. This is wrong for nulldata packets that can't be
+encrypted and are sent out for probing clients and indicating 4-address
+mode.
+
+Reported-by: Sebastian Gottschall <s.gottschall at dd-wrt.com>
+Fixes: a0761a301746 ("mac80211: drop data frames without key on encrypted links")
+Signed-off-by: Felix Fietkau <nbd at nbd.name>
+---
+
+--- a/net/mac80211/tx.c
++++ b/net/mac80211/tx.c
+@@ -657,7 +657,7 @@ ieee80211_tx_h_select_key(struct ieee802
+ 		if (!skip_hw && tx->key &&
+ 		    tx->key->flags & KEY_FLAG_UPLOADED_TO_HARDWARE)
+ 			info->control.hw_key = &tx->key->conf;
+-	} else if (!ieee80211_is_mgmt(hdr->frame_control) && tx->sta &&
++	} else if (ieee80211_is_data_present(hdr->frame_control) && tx->sta &&
+ 		   test_sta_flag(tx->sta, WLAN_STA_USES_ENCRYPTION)) {
+ 		return TX_DROP;
+ 	}