Commit b457d871 authored by Johannes Berg's avatar Johannes Berg
Browse files

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: default avatarJohannes Berg <johannes.berg@intel.com>
parent 6ee02709

net/mac80211/wpa.c

+0 −3
Original line number Diff line number Diff line
@@ -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);

}