diff mbox series

[v2] mac80211: fix authentication with iwlwifi/mvm

Message ID 20200329225004.115da08b271d.I9712908b102ee30fe76fa72c9ec93c92f52ab689@changeid (mailing list archive)
State Accepted
Delegated to: Johannes Berg
Headers show
Series [v2] mac80211: fix authentication with iwlwifi/mvm | expand

Commit Message

Johannes Berg March 29, 2020, 8:50 p.m. UTC 
From: Johannes Berg <johannes.berg@intel.com>

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>
---
Dave, can you please apply this directly?

(sorry, I shall remember to use git commit --amend properly)

---
 net/mac80211/tx.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

David Miller March 30, 2020, 4:21 a.m. UTC | #1 
From: Johannes Berg <johannes@sipsolutions.net>
Date: Sun, 29 Mar 2020 22:50:06 +0200

> From: Johannes Berg <johannes.berg@intel.com>
> 
> 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>
> ---
> Dave, can you please apply this directly?
> 
> (sorry, I shall remember to use git commit --amend properly)

Unfortunately v5.6 went out without this, but I'll apply it and queue
it up for -stable.

Thanks Johannes.
diff mbox series

Patch

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) &&