Gentoo Archives: gentoo-commits

From: Mike Pagano <mpagano@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/linux-patches:5.6 commit in: /
Date: Mon, 30 Mar 2020 12:31:05
Message-Id: 1585571432.9fc909669416a6c8a9300e97b0957c016b187378.mpagano@gentoo
1 commit: 9fc909669416a6c8a9300e97b0957c016b187378
2 Author: Mike Pagano <mpagano <AT> gentoo <DOT> org>
3 AuthorDate: Mon Mar 30 12:30:32 2020 +0000
4 Commit: Mike Pagano <mpagano <AT> gentoo <DOT> org>
5 CommitDate: Mon Mar 30 12:30:32 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=9fc90966
7
8 mac80211: fix authentication with iwlwifi/mvm
9
10 Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org>
11
12 0000_README | 4 +++
13 2400_mac80211-iwlwifi-authentication-fix.patch | 34 ++++++++++++++++++++++++++
14 2 files changed, 38 insertions(+)
15
16 diff --git a/0000_README b/0000_README
17 index fd3ee5e..5080b3d 100644
18 --- a/0000_README
19 +++ b/0000_README
20 @@ -55,6 +55,10 @@ Patch: 2000_BT-Check-key-sizes-only-if-Secure-Simple-Pairing-enabled.patch
21 From: https://lore.kernel.org/linux-bluetooth/20190522070540.48895-1-marcel@××××××××.org/raw
22 Desc: Bluetooth: Check key sizes only when Secure Simple Pairing is enabled. See bug #686758
23
24 +Patch: 2400_mac80211-iwlwifi-authentication-fix.patch
25 +From: https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git/patch/?id=be8c827f50a0bcd56361b31ada11dc0a3c2fd240
26 +Desc: mac80211: fix authentication with iwlwifi/mvm
27 +
28 Patch: 2600_enable-key-swapping-for-apple-mac.patch
29 From: https://github.com/free5lot/hid-apple-patched
30 Desc: This hid-apple patch enables swapping of the FN and left Control keys and some additional on some apple keyboards. See bug #622902
31
32 diff --git a/2400_mac80211-iwlwifi-authentication-fix.patch b/2400_mac80211-iwlwifi-authentication-fix.patch
33 new file mode 100644
34 index 0000000..87f14d3
35 --- /dev/null
36 +++ b/2400_mac80211-iwlwifi-authentication-fix.patch
37 @@ -0,0 +1,34 @@
38 +From be8c827f50a0bcd56361b31ada11dc0a3c2fd240 Mon Sep 17 00:00:00 2001
39 +From: Johannes Berg <johannes.berg@×××××.com>
40 +Date: Sun, 29 Mar 2020 22:50:06 +0200
41 +Subject: mac80211: fix authentication with iwlwifi/mvm
42 +
43 +The original patch didn't copy the ieee80211_is_data() condition
44 +because on most drivers the management frames don't go through
45 +this path. However, they do on iwlwifi/mvm, so we do need to keep
46 +the condition here.
47 +
48 +Cc: stable@×××××××××××.org
49 +Fixes: ce2e1ca70307 ("mac80211: Check port authorization in the ieee80211_tx_dequeue() case")
50 +Signed-off-by: Johannes Berg <johannes.berg@×××××.com>
51 +Signed-off-by: David S. Miller <davem@×××××××××.net>
52 +---
53 + net/mac80211/tx.c | 3 ++-
54 + 1 file changed, 2 insertions(+), 1 deletion(-)
55 +
56 +diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
57 +index d9cca6dbd870..efe4c1fc68e5 100644
58 +--- a/net/mac80211/tx.c
59 ++++ b/net/mac80211/tx.c
60 +@@ -3610,7 +3610,8 @@ begin:
61 + * Drop unicast frames to unauthorised stations unless they are
62 + * EAPOL frames from the local station.
63 + */
64 +- if (unlikely(!ieee80211_vif_is_mesh(&tx.sdata->vif) &&
65 ++ if (unlikely(ieee80211_is_data(hdr->frame_control) &&
66 ++ !ieee80211_vif_is_mesh(&tx.sdata->vif) &&
67 + tx.sdata->vif.type != NL80211_IFTYPE_OCB &&
68 + !is_multicast_ether_addr(hdr->addr1) &&
69 + !test_sta_flag(tx.sta, WLAN_STA_AUTHORIZED) &&
70 +--
71 +cgit 1.2-0.3.lf.el7