diff options
| author | Arkadiusz Miśkiewicz | 2020-03-30 17:28:01 (GMT) |
|---|---|---|
| committer | Arkadiusz Miśkiewicz | 2020-03-30 17:28:01 (GMT) |
| commit | 02a97f96c8c53876df371702f9fff3f555cc481c (patch) | |
| tree | e5ff42625b899024e8d819f3a0f81e4f2d762281 /kernel-small_fixes.patch | |
| parent | 5ef53d513a7c4965b3a2ccfcd5e430b74618cac0 (diff) | |
| download | kernel-02a97f96c8c53876df371702f9fff3f555cc481c.zip kernel-02a97f96c8c53876df371702f9fff3f555cc481c.tar.gz | |
- fix authentication with iwlwifi/mvm
Diffstat (limited to 'kernel-small_fixes.patch')
| -rw-r--r-- | kernel-small_fixes.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch index 8d98589..e048ce5 100644 --- a/kernel-small_fixes.patch +++ b/kernel-small_fixes.patch @@ -106,3 +106,38 @@ diff -ur linux-5.3/drivers/scsi/aacraid.org/linit.c linux-5.3/drivers/scsi/aacra aac_define_int_mode(dev); if (dev->msi_enabled) +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 + +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 1.2-0.3.lf.el7 + |