Commit dd5f4a04 authored Feb 02, 2020 by Gilad Ben-Yossef Committed by Greg Kroah-Hartman Apr 17, 2020

crypto: ccree - dec auth tag size from cryptlen map



[ Upstream commit 8962c6d2c2b8ca51b0f188109015b15fc5f4da44 ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent a44ed698

drivers/crypto/ccree/cc_buffer_mgr.c

+6 −2

Original line number	Diff line number	Diff line
		@@ -1021,8 +1021,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);