FAILED: patch "[PATCH] crypto: ccree - dec auth tag size from cryptlen map" failed to apply to 4.19-stable tree

FAILED: patch "[PATCH] crypto: ccree - dec auth tag size from cryptlen map" failed to apply to 4.19-stable tree

[gregkh]

The patch below does not apply to the 4.19-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable@vger.kernel.org>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 8962c6d2c2b8ca51b0f188109015b15fc5f4da44 Mon Sep 17 00:00:00 2001
From: Gilad Ben-Yossef <gilad@benyossef.com>
Date: Sun, 2 Feb 2020 18:19:14 +0200
Subject: [PATCH] crypto: ccree - dec auth tag size from cryptlen map

Remove the auth tag size from cryptlen before mapping the destination
in out-of-place AEAD decryption thus resolving a crash with
extended testmgr tests.

Signed-off-by: Gilad Ben-Yossef <gilad@benyossef.com>
Reported-by: Geert Uytterhoeven <geert+renesas@glider.be>
Cc: stable@vger.kernel.org # v4.19+
Tested-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/ccree/cc_buffer_mgr.c b/drivers/crypto/ccree/cc_buffer_mgr.c
index 885347b5b372..954f14bddf1d 100644
--- a/drivers/crypto/ccree/cc_buffer_mgr.c
+++ b/drivers/crypto/ccree/cc_buffer_mgr.c
@@ -894,8 +894,12 @@ static int cc_aead_chain_data(struct cc_drvdata *drvdata,
 
 	if (req->src != req->dst) {
 		size_for_map = areq_ctx->assoclen + req->cryptlen;
-		size_for_map += (direct == DRV_CRYPTO_DIRECTION_ENCRYPT) ?
-				authsize : 0;
+
+		if (direct == DRV_CRYPTO_DIRECTION_ENCRYPT)
+			size_for_map += authsize;
+		else
+			size_for_map -= authsize;
+
 		if (is_gcm4543)
 			size_for_map += crypto_aead_ivsize(tfm);
 

Re: FAILED: patch "[PATCH] crypto: ccree - dec auth tag size from cryptlen map" failed to apply to 4.19-stable tree

[Sasha Levin]

On Wed, Apr 15, 2020 at 01:07:27PM +0200, gregkh@linuxfoundation.org wrote:
>
>The patch below does not apply to the 4.19-stable tree.
>If someone wants it applied there, or to any other stable or longterm
>tree, then please email the backport, including the original git commit
>id to <stable@vger.kernel.org>.
>
>thanks,
>
>greg k-h
>
>------------------ original commit in Linus's tree ------------------
>
>From 8962c6d2c2b8ca51b0f188109015b15fc5f4da44 Mon Sep 17 00:00:00 2001
>From: Gilad Ben-Yossef <gilad@benyossef.com>
>Date: Sun, 2 Feb 2020 18:19:14 +0200
>Subject: [PATCH] crypto: ccree - dec auth tag size from cryptlen map
>
>Remove the auth tag size from cryptlen before mapping the destination
>in out-of-place AEAD decryption thus resolving a crash with
>extended testmgr tests.
>
>Signed-off-by: Gilad Ben-Yossef <gilad@benyossef.com>
>Reported-by: Geert Uytterhoeven <geert+renesas@glider.be>
>Cc: stable@vger.kernel.org # v4.19+
>Tested-by: Geert Uytterhoeven <geert+renesas@glider.be>
>Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

Grabbing:

da3cf67f1bcf ("crypto: ccree - don't mangle the request assoclen")
9f31eb6e08cc ("crypto: ccree - zero out internal struct before use")
ccba2f1112d4 ("crypto: ccree - improve error handling")

resolved this conflict.

-- 
Thanks,
Sasha

Re: FAILED: patch "[PATCH] crypto: ccree - dec auth tag size from cryptlen map" failed to apply to 4.19-stable tree

[Gilad Ben-Yossef]

On Thu, Apr 16, 2020 at 4:37 AM Sasha Levin <sashal@kernel.org> wrote:
>
> On Wed, Apr 15, 2020 at 01:07:27PM +0200, gregkh@linuxfoundation.org wrote:
> >
> >The patch below does not apply to the 4.19-stable tree.
> >If someone wants it applied there, or to any other stable or longterm
> >tree, then please email the backport, including the original git commit
> >id to <stable@vger.kernel.org>.
> >
> >thanks,
> >
> >greg k-h
> >
> >------------------ original commit in Linus's tree ------------------
> >
> >From 8962c6d2c2b8ca51b0f188109015b15fc5f4da44 Mon Sep 17 00:00:00 2001
> >From: Gilad Ben-Yossef <gilad@benyossef.com>
> >Date: Sun, 2 Feb 2020 18:19:14 +0200
> >Subject: [PATCH] crypto: ccree - dec auth tag size from cryptlen map
> >
> >Remove the auth tag size from cryptlen before mapping the destination
> >in out-of-place AEAD decryption thus resolving a crash with
> >extended testmgr tests.
> >
> >Signed-off-by: Gilad Ben-Yossef <gilad@benyossef.com>
> >Reported-by: Geert Uytterhoeven <geert+renesas@glider.be>
> >Cc: stable@vger.kernel.org # v4.19+
> >Tested-by: Geert Uytterhoeven <geert+renesas@glider.be>
> >Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
>
> Grabbing:
>
> da3cf67f1bcf ("crypto: ccree - don't mangle the request assoclen")
> 9f31eb6e08cc ("crypto: ccree - zero out internal struct before use")
> ccba2f1112d4 ("crypto: ccree - improve error handling")
>
> resolved this conflict.
>
>
>

Acked-by: Gilad Ben-Yossef <gilad@benyossef.com>

Thanks,
Gilad
-- 
Gilad Ben-Yossef
Chief Coffee Drinker

values of β will give rise to dom!