diff options
| author |   Felix Fietkau <nbd@nbd.name> | 2020-12-18 20:15:25 +0100 |
|---|---|---|
| committer |   Johannes Berg <johannes.berg@intel.com> | 2021-01-14 22:26:10 +0100 |
| commit | 2463ec86cd0338a2c2edbfb0b9d50c52ff76ff43 (patch) | |
| tree | 71eb37f4fb57c0592943b2de96a91448fc0dc763 /net/mac80211/tx.c | |
| parent | mac80211: fix encryption key selection for 802.3 xmit (diff) | |
| download | linux-dev-2463ec86cd0338a2c2edbfb0b9d50c52ff76ff43.tar.xz linux-dev-2463ec86cd0338a2c2edbfb0b9d50c52ff76ff43.zip | |
mac80211: do not drop tx nulldata packets on encrypted links
ieee80211_tx_h_select_key drops any non-mgmt packets without a key when
encryption is used. This is wrong for nulldata packets that can't be
encrypted and are sent out for probing clients and indicating 4-address
mode.
Reported-by: Sebastian Gottschall <s.gottschall@dd-wrt.com>
Fixes: a0761a301746 ("mac80211: drop data frames without key on encrypted links")
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Link: https://lore.kernel.org/r/20201218191525.1168-1-nbd@nbd.name
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/tx.c')
| -rw-r--r-- | net/mac80211/tx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index 2d606dbab37c..de8325c79dd5 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -649,7 +649,7 @@ ieee80211_tx_h_select_key(struct ieee80211_tx_data *tx) if (!skip_hw && tx->key && tx->key->flags & KEY_FLAG_UPLOADED_TO_HARDWARE) info->control.hw_key = &tx->key->conf; - } else if (!ieee80211_is_mgmt(hdr->frame_control) && tx->sta && + } else if (ieee80211_is_data_present(hdr->frame_control) && tx->sta && test_sta_flag(tx->sta, WLAN_STA_USES_ENCRYPTION)) { return TX_DROP; } |