diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2020-03-29 22:50:06 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-04-02 15:28:22 +0200 |
| commit | 605c89616911e047170bec695226d9b5a4bd0bcf (patch) | |
| tree | 1c2b2f1e8812efb7a8f335af78578164e0d37bdb | |
| parent | a4f68ecf73363564822a8f0266630427f25aa393 (diff) | |
| download | linux-stable-605c89616911e047170bec695226d9b5a4bd0bcf.tar.gz linux-stable-605c89616911e047170bec695226d9b5a4bd0bcf.tar.bz2 linux-stable-605c89616911e047170bec695226d9b5a4bd0bcf.zip | |
mac80211: fix authentication with iwlwifi/mvm
commit be8c827f50a0bcd56361b31ada11dc0a3c2fd240 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: 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>
Cc: Woody Suwalski <terraluna977@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | net/mac80211/tx.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index e2487da4024b..84639363173b 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -3519,7 +3519,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) && |