36 lines
1.4 KiB
Diff
36 lines
1.4 KiB
Diff
|
From b8b93985bfe32da1230ec77c75dde398a0c3b142 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
|
||
|
|
|
||
|
|
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 @@ struct sk_buff *ieee80211_tx_dequeue(struct ieee80211_hw *hw,
|
||
|
|
* 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) &&
|
||
|
|
--
|
||
|
|
2.26.0
|
||
|
|
|