mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-02 23:27:06 +00:00
mac80211: fix authentication with iwlwifi/mvm
commitbe8c827f50
upstream. 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:ce2e1ca703
("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> Cc: Woody Suwalski <terraluna977@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
a4f68ecf73
commit
605c896169
1 changed files with 2 additions and 1 deletions
|
@ -3519,7 +3519,8 @@ struct sk_buff *ieee80211_tx_dequeue(struct ieee80211_hw *hw,
|
||||||
* Drop unicast frames to unauthorised stations unless they are
|
* Drop unicast frames to unauthorised stations unless they are
|
||||||
* EAPOL frames from the local station.
|
* 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 &&
|
tx.sdata->vif.type != NL80211_IFTYPE_OCB &&
|
||||||
!is_multicast_ether_addr(hdr->addr1) &&
|
!is_multicast_ether_addr(hdr->addr1) &&
|
||||||
!test_sta_flag(tx.sta, WLAN_STA_AUTHORIZED) &&
|
!test_sta_flag(tx.sta, WLAN_STA_AUTHORIZED) &&
|
||||||
|
|
Loading…
Reference in a new issue