tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Linus Torvalds c072629f 614da1d3

+6
unified split
+6
crypto/authencesn.c
··· 169 struct scatterlist *src, *dst; 170 int err; 171 172 sg_init_table(areq_ctx->src, 2); 173 src = scatterwalk_ffwd(areq_ctx->src, req->src, assoclen); 174 dst = src; ··· 258 struct scatterlist *dst = req->dst; 259 u32 tmp[2]; 260 int err; 261 262 cryptlen -= authsize; 263
··· 169 struct scatterlist *src, *dst; 170 int err; 171 172 + if (assoclen < 8) 173 + return -EINVAL; 174 + 175 sg_init_table(areq_ctx->src, 2); 176 src = scatterwalk_ffwd(areq_ctx->src, req->src, assoclen); 177 dst = src; ··· 255 struct scatterlist *dst = req->dst; 256 u32 tmp[2]; 257 int err; 258 + 259 + if (assoclen < 8) 260 + return -EINVAL; 261 262 cryptlen -= authsize; 263