From: Johannes Berg Date: Mon, 21 Oct 2024 13:14:14 +0000 (+0200) Subject: wifi: mac80211: remove misleading j_0 construction parts X-Git-Tag: v6.13-rc1~135^2~195^2~5 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b457d8713872a9aad89c8a57dd8fe471c7db158d;p=thirdparty%2Fkernel%2Flinux.git wifi: mac80211: remove misleading j_0 construction parts The GCM algorithm implementation in the kernel assumes that a 12-byte IV is passed, not the actual J_0 from the GCM spec. Don't rename, that'd be messy, but also don't fill the bytes beyond the IV that aren't used, since otherwise it looks as though j_0[12] is used uninitialized. Link: https://patch.msgid.link/20241021151414.798ceb7a5896.Ic57751edad228d56865ecf7433fef469e5e0a4aa@changeid Signed-off-by: Johannes Berg --- diff --git a/net/mac80211/wpa.c b/net/mac80211/wpa.c index 293afa3f57c50..40d5d9e484791 100644 --- a/net/mac80211/wpa.c +++ b/net/mac80211/wpa.c @@ -598,9 +598,6 @@ static void gcmp_special_blocks(struct sk_buff *skb, u8 *pn, u8 *j_0, u8 *aad, memcpy(j_0, hdr->addr2, ETH_ALEN); memcpy(&j_0[ETH_ALEN], pn, IEEE80211_GCMP_PN_LEN); - j_0[13] = 0; - j_0[14] = 0; - j_0[AES_BLOCK_SIZE - 1] = 0x01; ccmp_gcmp_aad(skb, aad, spp_amsdu); }