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+ --- drivers/crypto/ccree/cc_buffer_mgr.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
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);
Hi Gilad,
On Sun, Feb 2, 2020 at 5:19 PM Gilad Ben-Yossef gilad@benyossef.com wrote:
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+
Thanks, this fixes the crash seen on R-Car H3 ES2.0 with renesas_defconfig, CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=n, and CONFIG_CRYPTO_MANAGER_EXTRA_TESTS=y
Tested-by: Geert Uytterhoeven geert+renesas@glider.be
Remaining issues reported during boot: 1. alg: skcipher: blocksize for xts-aes-ccree (1) doesn't match generic impl (16) 2. alg: aead: rfc4543-gcm-aes-ccree decryption unexpectedly succeeded on test vector "random: alen=16 plen=39 authsize=16 klen=20 novrfy=1"; expected_error=-EBADMSG or -22, cfg="random: may_sleep use_digest src_divs=[4.47%@+3553, 30.80%@+4065, 12.0%@+11, 6.22%@+2999, 46.51%@alignmask+3468]"
Gr{oetje,eeting}s,
Geert
On Thu, Feb 6, 2020 at 4:45 PM Geert Uytterhoeven geert@linux-m68k.org wrote:
Hi Gilad,
On Sun, Feb 2, 2020 at 5:19 PM Gilad Ben-Yossef gilad@benyossef.com wrote:
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+
Thanks, this fixes the crash seen on R-Car H3 ES2.0 with renesas_defconfig, CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=n, and CONFIG_CRYPTO_MANAGER_EXTRA_TESTS=y
Tested-by: Geert Uytterhoeven geert+renesas@glider.be
Thanks again for your help.
Remaining issues reported during boot:
- alg: skcipher: blocksize for xts-aes-ccree (1) doesn't match
generic impl (16)
Yes, this is actually a known issue with the generic XTS implementation. See: https://lore.kernel.org/linux-crypto/VI1PR0402MB34858E4EF0ACA7CDB446FF5798CE...
- alg: aead: rfc4543-gcm-aes-ccree decryption unexpectedly
succeeded on test vector "random: alen=16 plen=39 authsize=16 klen=20 novrfy=1"; expected_error=-EBADMSG or -22, cfg="random: may_sleep use_digest src_divs=[4.47%@+3553, 30.80%@+4065, 12.0%@+11, 6.22%@+2999, 46.51%@alignmask+3468]"
Yes, I am working on this one right now.
Many thanks, Gilad
On Sun, Feb 02, 2020 at 06:19:14PM +0200, Gilad Ben-Yossef wrote:
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+
drivers/crypto/ccree/cc_buffer_mgr.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
Patch applied. Thanks.
linux-stable-mirror@lists.linaro.org
-
Geert Uytterhoeven -
Gilad Ben-Yossef -
Herbert Xu