This push contains the following changes:

- Add assoclen check in authencesn.
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEn51F/lCuNhUwmDeSxycdCkmxi6cFAmlvI3EACgkQxycdCkmx
 i6cNEw/+O8NYAk2QPbYaG0gFrlCPHT7IxhJLZMXNFWZgibrJbdImyX/oPGluGt98
 vE74h4A9NLJ9pR/oDq9j/HQ+pUITYNw8GYDTnnESAlQRZedg1hZPoGHnlVg9f+/H
 bvRAmvNW2SK1POz97pTvwLDx6WEOq22rl5OsQrobnd54qvXCLzhTSeL8jgciHWzA
 pCRGaW8EpqjwQLr8ndAftrh9cDqU5D5SuRvjhxJurcviv1o3m3Ba30zzflmLbijI
 ErvTwlPax6aNBzB0Xib/tm+0Iu977Hu5ambNp9qKk5PnQU4+7XHR3OjxibimLFVP
 92VVgcnvXSfOum1HwXyw9p6I/dA2+r6dXY+a5iBPuaHdxu8cp3+zWnCh/K3ymXr6
 ov6qZGQGdc7BkkD+lqT6B70dKm/+WwjEY4hh8uNXyM6XAOmvv4YwmQeTqvM9rK6i
 MtXo39e1/VWHyOusHA9Hrw8j0uqqcOGnoBKtPiOfqW30ftfZANU6rjrnrUk0hlSS
 UUSMv7QJx/myoUltrBZLmE3g2ZK+HiOjGL2/A0cBAyQhl5A8zh1Q8QiDU7uFgxCK
 VIZ5OuqarBL2zEkvp8tKp5Se8RrSE+E+Mqbxi00GV1PVPxcG+3GgkG5yA/pGJWwu
 hfWhcscAQX15+cocaY5sTgEvKJd3MCodkLaXaIJvuvXV8qBV+V0=
 =BEIq
 -----END PGP SIGNATURE-----

Merge tag 'v6.19-p4' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

Pull crypto fix from Herbert Xu:

 - Add assoclen check in authencesn

* tag 'v6.19-p4' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: authencesn - reject too-short AAD (assoclen<8) to match ESP/ESN spec
This commit is contained in:
Linus Torvalds 2026-01-22 19:39:25 -08:00
commit c072629f05

View File

@ -169,6 +169,9 @@ static int crypto_authenc_esn_encrypt(struct aead_request *req)
struct scatterlist *src, *dst;
int err;
if (assoclen < 8)
return -EINVAL;
sg_init_table(areq_ctx->src, 2);
src = scatterwalk_ffwd(areq_ctx->src, req->src, assoclen);
dst = src;
@ -256,6 +259,9 @@ static int crypto_authenc_esn_decrypt(struct aead_request *req)
u32 tmp[2];
int err;
if (assoclen < 8)
return -EINVAL;
cryptlen -= authsize;
if (req->src != dst)