]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
5.6-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 1 Apr 2020 11:40:26 +0000 (13:40 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 1 Apr 2020 11:40:26 +0000 (13:40 +0200)
added patches:
mac80211-fix-authentication-with-iwlwifi-mvm.patch

queue-5.6/mac80211-fix-authentication-with-iwlwifi-mvm.patch [new file with mode: 0644]
queue-5.6/series

diff --git a/queue-5.6/mac80211-fix-authentication-with-iwlwifi-mvm.patch b/queue-5.6/mac80211-fix-authentication-with-iwlwifi-mvm.patch
new file mode 100644 (file)
index 0000000..479b99c
--- /dev/null
@@ -0,0 +1,37 @@
+From be8c827f50a0bcd56361b31ada11dc0a3c2fd240 Mon Sep 17 00:00:00 2001
+From: Johannes Berg <johannes.berg@intel.com>
+Date: Sun, 29 Mar 2020 22:50:06 +0200
+Subject: mac80211: fix authentication with iwlwifi/mvm
+
+From: Johannes Berg <johannes.berg@intel.com>
+
+commit be8c827f50a0bcd56361b31ada11dc0a3c2fd240 upstream.
+
+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: stable@vger.kernel.org
+Fixes: ce2e1ca70307 ("mac80211: Check port authorization in the ieee80211_tx_dequeue() case")
+Signed-off-by: Johannes Berg <johannes.berg@intel.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Cc: Woody Suwalski <terraluna977@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ net/mac80211/tx.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- 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) &&
index edb199742ec3eb40ccc4f4270fdd7c06f4e5ab15..1b0b9fb4ce1dc30348b1d2153dfd501ff96e10c0 100644 (file)
@@ -1 +1,2 @@
 bpf-update-jmp32-test-cases-to-fix-range-bound-deduction.patch
+mac80211-fix-authentication-with-iwlwifi-mvm.patch