]> git.ipfire.org Git - thirdparty/linux.git/commit
lib/crypto: chacha20poly1305: Statically check fixed array lengths
authorJason A. Donenfeld <Jason@zx2c4.com>
Sun, 23 Nov 2025 05:48:20 +0000 (06:48 +0100)
committerEric Biggers <ebiggers@kernel.org>
Sun, 23 Nov 2025 20:19:21 +0000 (12:19 -0800)
commitac653d57ad8bb873c1c68fe77a1dee81cc1e365d
treef4fe8f98d0c8854633a92d77bf7918980a381b99
parent074e16d58e6b78612c22ff611aa469ee929cc37f
lib/crypto: chacha20poly1305: Statically check fixed array lengths

Several parameters of the chacha20poly1305 functions require arrays of
an exact length. Use the new at_least keyword to instruct gcc and
clang to statically check that the caller is passing an object of at
least that length.

Here it is in action, with this faulty patch to wireguard's cookie.h:

     struct cookie_checker {
      u8 secret[NOISE_HASH_LEN];
    - u8 cookie_encryption_key[NOISE_SYMMETRIC_KEY_LEN];
    + u8 cookie_encryption_key[NOISE_SYMMETRIC_KEY_LEN - 1];
      u8 message_mac1_key[NOISE_SYMMETRIC_KEY_LEN];

If I try compiling this code, I get this helpful warning:

  CC      drivers/net/wireguard/cookie.o
drivers/net/wireguard/cookie.c: In function ‘wg_cookie_message_create’:
drivers/net/wireguard/cookie.c:193:9: warning: ‘xchacha20poly1305_encrypt’ reading 32 bytes from a region of size 31 [-Wstringop-overread]
  193 |         xchacha20poly1305_encrypt(dst->encrypted_cookie, cookie, COOKIE_LEN,
      |         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  194 |                                   macs->mac1, COOKIE_LEN, dst->nonce,
      |                                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  195 |                                   checker->cookie_encryption_key);
      |                                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/net/wireguard/cookie.c:193:9: note: referencing argument 7 of type ‘const u8 *’ {aka ‘const unsigned char *’}
In file included from drivers/net/wireguard/messages.h:10,
                 from drivers/net/wireguard/cookie.h:9,
                 from drivers/net/wireguard/cookie.c:6:
include/crypto/chacha20poly1305.h:28:6: note: in a call to function ‘xchacha20poly1305_encrypt’
   28 | void xchacha20poly1305_encrypt(u8 *dst, const u8 *src, const size_t src_len,

Acked-by: Ard Biesheuvel <ardb@kernel.org>
Signed-off-by: "Jason A. Donenfeld" <Jason@zx2c4.com>
Link: https://lore.kernel.org/r/20251123054819.2371989-4-Jason@zx2c4.com
Signed-off-by: Eric Biggers <ebiggers@kernel.org>
include/crypto/chacha20poly1305.h
lib/crypto/chacha20poly1305.c