mac80211: don't encrypt pre-auth (ETH_P_PREAUTH) frames
PATCH 1/1 mac80211: don't encrypt pre-auth (ETH_P_PREAUTH) frames
Pre-authentication frames (ETH_P_PREAUTH, 0x88C7) are sent before the authentication handshake completes with the target AP, so no encryption key exists for them yet. Unlike normal EAPOL frames (ETH_P_8021X, 0x888E) which are registered as the control port protocol, pre-auth frames are not recognized as control port frames, causing the kernel to incorrectly assign the current AP's key and attempt encryption, resulting in a WARN_ON in ieee80211_encrypt_tx_skb when the cipher is not handled.
Fix this by setting IEEE80211_TX_INTFL_DONT_ENCRYPT for pre-auth frames in ieee80211_tx_h_check_control_port_protocol(), so that key selection skips them and they are sent unencrypted as intended.
--- net/mac80211/tx.c | 3 +++ 1 file changed, 3 insertions(+)
net/mac80211/tx.c +3 -0
@@ -557,6 +557,9 @@ ieee80211_tx_h_check_control_port_protocol(struct ieee80211_tx_data *tx) info->flags |=IEEE80211_TX_CTL_USE_MINRATE ; } +if (tx->skb->protocol ==htons (ETH_P_PREAUTH )) + info->flags |=IEEE80211_TX_INTFL_DONT_ENCRYPT ; +return TX_CONTINUE ; }
Signature · 1 line
2.43.0