diff options
| author | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2020-04-02 15:08:12 -0700 |
|---|---|---|
| committer | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2020-04-02 15:08:12 -0700 |
| commit | a2e16ccece383efc399d34717c865d034a863b89 (patch) | |
| tree | 5fdf5c79e39a96fbe1821ba7d1fb6d446fdebd29 /0002-mac80211-fix-authentication-with-iwlwifi-mvm.patch | |
| parent | Rebuild with bpf hotfix (diff) | |
| download | linux-libre-a2e16ccece383efc399d34717c865d034a863b89.tar.xz | |
Updated to 5.6.0
Diffstat (limited to '0002-mac80211-fix-authentication-with-iwlwifi-mvm.patch')
| -rw-r--r-- | 0002-mac80211-fix-authentication-with-iwlwifi-mvm.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/0002-mac80211-fix-authentication-with-iwlwifi-mvm.patch b/0002-mac80211-fix-authentication-with-iwlwifi-mvm.patch new file mode 100644 index 0000000..d4449b2 --- /dev/null +++ b/0002-mac80211-fix-authentication-with-iwlwifi-mvm.patch @@ -0,0 +1,35 @@ +From 61397cbfb977f37e4423813d1ad43340a627563a 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 + +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> +--- + 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 v1.2.3-1-gf6bb5 + |