Skip to content

Commit

Permalink
wifi: mac80211: remove misleading j_0 construction parts
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
jmberg-intel committed Oct 23, 2024
1 parent 6ee0270 commit b457d87
Showing 1 changed file with 0 additions and 3 deletions.
3 changes: 0 additions & 3 deletions net/mac80211/wpa.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down

0 comments on commit b457d87

Please sign in to comment.