diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2020-08-28 23:48:40 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2020-08-31 00:09:18 +0200 |
| commit | 8e89e1c337685013d35fe588d1bf6e323829ba98 (patch) | |
| tree | f4e8c1c5d4dbdc878ac383b0a326b2ba521455a6 /package/kernel/mac80211/patches/482-mac80211-fix-authentication-with-iwlwifi-mvm.patch | |
| parent | fec2888ae568ef392529bb1c6f75178cc8aad8c7 (diff) | |
| download | upstream-8e89e1c337685013d35fe588d1bf6e323829ba98.tar.gz upstream-8e89e1c337685013d35fe588d1bf6e323829ba98.tar.bz2 upstream-8e89e1c337685013d35fe588d1bf6e323829ba98.zip | |
mac80211: Backport fixes for Kr00k vulnerabilities
This backports some fixes from kernel 5.6 and 4.14.175.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Tested-By: Baptiste Jonglez <git@bitsofnetworks.org>
Diffstat (limited to 'package/kernel/mac80211/patches/482-mac80211-fix-authentication-with-iwlwifi-mvm.patch')
| -rw-r--r-- | package/kernel/mac80211/patches/482-mac80211-fix-authentication-with-iwlwifi-mvm.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/package/kernel/mac80211/patches/482-mac80211-fix-authentication-with-iwlwifi-mvm.patch b/package/kernel/mac80211/patches/482-mac80211-fix-authentication-with-iwlwifi-mvm.patch new file mode 100644 index 0000000000..777e122da0 --- /dev/null +++ b/package/kernel/mac80211/patches/482-mac80211-fix-authentication-with-iwlwifi-mvm.patch @@ -0,0 +1,34 @@ +From 8ad73f9e86bdb079043868e3543d302b57068b80 Mon Sep 17 00:00:00 2001 +From: Johannes Berg <johannes.berg@intel.com> +Date: Sun, 29 Mar 2020 22:50:06 +0200 +Subject: [PATCH] mac80211: fix authentication with iwlwifi/mvm + +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 +@@ -3502,7 +3502,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) && |