Commit be8c827f authored Mar 29, 2020 by Johannes Berg Committed by David S. Miller Mar 29, 2020

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: ce2e1ca7 ("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>

parent 7111951b

net/mac80211/tx.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -3610,7 +3610,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) &&

Admin message