This has been merged into mainline as commit 5937d81a9613a98381c1571a159ac971ae02182c. It should be applied against all stable kernels starting from v4.7. Thanks, -- Email: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
--- Begin Message ---
- Subject: [PATCH v2] crypto: AF_ALG - fix AEAD AIO handling of zero buffer
- From: Stephan Mueller <smueller@xxxxxxxxxx>
- Date: Thu, 01 Dec 2016 08:22:37 +0100
- Cc: linux-crypto@xxxxxxxxxxxxxxx
- Delivery-date: Thu, 01 Dec 2016 16:34:13 +0800
- Envelope-to: herbert@xxxxxxxxxxxxxxxxxxx
- User-agent: KMail/5.3.2 (Linux/4.8.10-300.fc25.x86_64; KDE/5.27.0; x86_64; ; )
Hi Herbert, I split out the bug fix patch from the AD/tag formatting patch as they most likely will come after the next merge window. ---8<--- Handle the case when the caller provided a zero buffer to sendmsg/sendpage. Such scenario is legal for AEAD ciphers when no plaintext / ciphertext and no AAD is provided and the caller only requests the generation of the tag value. Signed-off-by: Stephan Mueller <smueller@xxxxxxxxxx> --- crypto/algif_aead.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/crypto/algif_aead.c b/crypto/algif_aead.c index 80a0f1a..6e95137 100644 --- a/crypto/algif_aead.c +++ b/crypto/algif_aead.c @@ -448,12 +448,13 @@ static int aead_recvmsg_async(struct socket *sock, struct msghdr *msg, used -= ctx->aead_assoclen + (ctx->enc ? as : 0); /* take over all tx sgls from ctx */ - areq->tsgl = sock_kmalloc(sk, sizeof(*areq->tsgl) * sgl->cur, + areq->tsgl = sock_kmalloc(sk, + sizeof(*areq->tsgl) * max_t(u32, sgl->cur, 1), GFP_KERNEL); if (unlikely(!areq->tsgl)) goto free; - sg_init_table(areq->tsgl, sgl->cur); + sg_init_table(areq->tsgl, max_t(u32, sgl->cur, 1)); for (i = 0; i < sgl->cur; i++) sg_set_page(&areq->tsgl[i], sg_page(&sgl->sg[i]), sgl->sg[i].length, sgl->sg[i].offset); -- 2.9.3
--- End Message ---