commit:     9fc909669416a6c8a9300e97b0957c016b187378
Author:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 30 12:30:32 2020 +0000
Commit:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
CommitDate: Mon Mar 30 12:30:32 2020 +0000
URL:        https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=9fc90966

mac80211: fix authentication with iwlwifi/mvm

Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org>

 0000_README                                    |  4 +++
 2400_mac80211-iwlwifi-authentication-fix.patch | 34 ++++++++++++++++++++++++++
 2 files changed, 38 insertions(+)

diff --git a/0000_README b/0000_README
index fd3ee5e..5080b3d 100644
--- a/0000_README
+++ b/0000_README
@@ -55,6 +55,10 @@ Patch:  
2000_BT-Check-key-sizes-only-if-Secure-Simple-Pairing-enabled.patch
 From:   
https://lore.kernel.org/linux-bluetooth/[email protected]/raw
 Desc:   Bluetooth: Check key sizes only when Secure Simple Pairing is enabled. 
See bug #686758
 
+Patch:  2400_mac80211-iwlwifi-authentication-fix.patch
+From:   
https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git/patch/?id=be8c827f50a0bcd56361b31ada11dc0a3c2fd240
+Desc:   mac80211: fix authentication with iwlwifi/mvm
+
 Patch:  2600_enable-key-swapping-for-apple-mac.patch
 From:   https://github.com/free5lot/hid-apple-patched
 Desc:   This hid-apple patch enables swapping of the FN and left Control keys 
and some additional on some apple keyboards. See bug #622902

diff --git a/2400_mac80211-iwlwifi-authentication-fix.patch 
b/2400_mac80211-iwlwifi-authentication-fix.patch
new file mode 100644
index 0000000..87f14d3
--- /dev/null
+++ b/2400_mac80211-iwlwifi-authentication-fix.patch
@@ -0,0 +1,34 @@
+From be8c827f50a0bcd56361b31ada11dc0a3c2fd240 Mon Sep 17 00:00:00 2001
+From: Johannes Berg <[email protected]>
+Date: Sun, 29 Mar 2020 22:50:06 +0200
+Subject: mac80211: fix authentication with iwlwifi/mvm
+
+The original patch didn't copy the ieee80211_is_data() condition
+because on most drivers the management frames don't go through
+this path. However, they do on iwlwifi/mvm, so we do need to keep
+the condition here.
+
+Cc: [email protected]
+Fixes: ce2e1ca70307 ("mac80211: Check port authorization in the 
ieee80211_tx_dequeue() case")
+Signed-off-by: Johannes Berg <[email protected]>
+Signed-off-by: David S. Miller <[email protected]>
+---
+ net/mac80211/tx.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
+index d9cca6dbd870..efe4c1fc68e5 100644
+--- a/net/mac80211/tx.c
++++ b/net/mac80211/tx.c
+@@ -3610,7 +3610,8 @@ begin:
+                * Drop unicast frames to unauthorised stations unless they are
+                * EAPOL frames from the local station.
+                */
+-              if (unlikely(!ieee80211_vif_is_mesh(&tx.sdata->vif) &&
++              if (unlikely(ieee80211_is_data(hdr->frame_control) &&
++                           !ieee80211_vif_is_mesh(&tx.sdata->vif) &&
+                            tx.sdata->vif.type != NL80211_IFTYPE_OCB &&
+                            !is_multicast_ether_addr(hdr->addr1) &&
+                            !test_sta_flag(tx.sta, WLAN_STA_AUTHORIZED) &&
+-- 
+cgit 1.2-0.3.lf.el7

Reply via email to