From: Greg Kroah-Hartman Date: Wed, 1 Apr 2020 11:40:26 +0000 (+0200) Subject: 5.6-stable patches X-Git-Tag: v5.6.2~14 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d272f36e456c280798482ed2a3b55d668fd73868;p=thirdparty%2Fkernel%2Fstable-queue.git 5.6-stable patches added patches: mac80211-fix-authentication-with-iwlwifi-mvm.patch --- 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 index 00000000000..479b99c2813 --- /dev/null +++ b/queue-5.6/mac80211-fix-authentication-with-iwlwifi-mvm.patch @@ -0,0 +1,37 @@ +From be8c827f50a0bcd56361b31ada11dc0a3c2fd240 Mon Sep 17 00:00:00 2001 +From: Johannes Berg +Date: Sun, 29 Mar 2020 22:50:06 +0200 +Subject: mac80211: fix authentication with iwlwifi/mvm + +From: Johannes Berg + +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 +Signed-off-by: David S. Miller +Cc: Woody Suwalski +Signed-off-by: Greg Kroah-Hartman + +--- + 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) && diff --git a/queue-5.6/series b/queue-5.6/series index edb199742ec..1b0b9fb4ce1 100644 --- a/queue-5.6/series +++ b/queue-5.6/series @@ -1 +1,2 @@ bpf-update-jmp32-test-cases-to-fix-range-bound-deduction.patch +mac80211-fix-authentication-with-iwlwifi-mvm.patch