| 12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970 |
- From: Michael-CY Lee <[email protected]>
- Date: Tue, 26 Mar 2024 08:30:36 +0800
- Subject: [PATCH] wifi: mac80211: extend IEEE80211_KEY_FLAG_GENERATE_MMIE to
- other ciphers
- Extend the flag IEEE80211_KEY_FLAG_GENERATE_MMIE to BIP-CMAC-256,
- BIP-GMAC-128 and BIP-GMAC-256 for the same reason and in the same
- way that the flag was added originally in commit a0b4496a4368
- ("mac80211: add IEEE80211_KEY_FLAG_GENERATE_MMIE to ieee80211_key_flags").
- Signed-off-by: Michael-CY Lee <[email protected]>
- Link: https://msgid.link/[email protected]
- Signed-off-by: Johannes Berg <[email protected]>
- ---
- --- a/include/net/mac80211.h
- +++ b/include/net/mac80211.h
- @@ -2032,8 +2032,8 @@ static inline bool lockdep_vif_mutex_hel
- * @IEEE80211_KEY_FLAG_GENERATE_MMIC on the same key.
- * @IEEE80211_KEY_FLAG_NO_AUTO_TX: Key needs explicit Tx activation.
- * @IEEE80211_KEY_FLAG_GENERATE_MMIE: This flag should be set by the driver
- - * for a AES_CMAC key to indicate that it requires sequence number
- - * generation only
- + * for a AES_CMAC or a AES_GMAC key to indicate that it requires sequence
- + * number generation only
- */
- enum ieee80211_key_flags {
- IEEE80211_KEY_FLAG_GENERATE_IV_MGMT = BIT(0),
- --- a/net/mac80211/wpa.c
- +++ b/net/mac80211/wpa.c
- @@ -882,7 +882,8 @@ ieee80211_crypto_aes_cmac_256_encrypt(st
-
- info = IEEE80211_SKB_CB(skb);
-
- - if (info->control.hw_key)
- + if (info->control.hw_key &&
- + !(key->conf.flags & IEEE80211_KEY_FLAG_GENERATE_MMIE))
- return TX_CONTINUE;
-
- if (WARN_ON(skb_tailroom(skb) < sizeof(*mmie)))
- @@ -898,6 +899,9 @@ ieee80211_crypto_aes_cmac_256_encrypt(st
-
- bip_ipn_set64(mmie->sequence_number, pn64);
-
- + if (info->control.hw_key)
- + return TX_CONTINUE;
- +
- bip_aad(skb, aad);
-
- /* MIC = AES-256-CMAC(IGTK, AAD || Management Frame Body || MMIE, 128)
- @@ -1027,7 +1031,8 @@ ieee80211_crypto_aes_gmac_encrypt(struct
-
- info = IEEE80211_SKB_CB(skb);
-
- - if (info->control.hw_key)
- + if (info->control.hw_key &&
- + !(key->conf.flags & IEEE80211_KEY_FLAG_GENERATE_MMIE))
- return TX_CONTINUE;
-
- if (WARN_ON(skb_tailroom(skb) < sizeof(*mmie)))
- @@ -1043,6 +1048,9 @@ ieee80211_crypto_aes_gmac_encrypt(struct
-
- bip_ipn_set64(mmie->sequence_number, pn64);
-
- + if (info->control.hw_key)
- + return TX_CONTINUE;
- +
- bip_aad(skb, aad);
-
- hdr = (struct ieee80211_hdr *)skb->data;
|
