* [PATCH v2] mac80211: fix authentication with iwlwifi/mvm
@ 2020-03-29 20:50 Johannes Berg
2020-03-30 4:21 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Johannes Berg @ 2020-03-29 20:50 UTC (permalink / raw)
To: linux-wireless, netdev; +Cc: davem, j, Johannes Berg, stable
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(-)
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.25.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2] mac80211: fix authentication with iwlwifi/mvm
2020-03-29 20:50 [PATCH v2] mac80211: fix authentication with iwlwifi/mvm Johannes Berg
@ 2020-03-30 4:21 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2020-03-30 4:21 UTC (permalink / raw)
To: johannes; +Cc: linux-wireless, netdev, j, johannes.berg, stable
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.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-03-30 4:21 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-03-29 20:50 [PATCH v2] mac80211: fix authentication with iwlwifi/mvm Johannes Berg
2020-03-30 4:21 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).