NothingOSS/android_kernel_msm-6.1_nothing_sm7635
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

crypto: caam/qi2 - fix Chacha20 + Poly1305 self test failure

Browse source 
[ Upstream commit 7b8c6aee0d5b864e70c0da82583f9862e374eaf3 ]

key buffer is not copied in chachapoly_setkey function,
results in wrong output for encryption/decryption operation.

fix this by memcpy the key in caam_ctx key arrary

Fixes: c10a533679 ("crypto: caam/qi2 - add support for Chacha20 + Poly1305")
Signed-off-by: Gaurav Jain <gaurav.jain@nxp.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Gaurav Jain 2023-09-21 15:14:44 +05:30 • committed by Greg Kroah-Hartman
parent f23859748e
commit 9857f811e5
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
drivers/crypto/caam/caamalg_qi2.c
View file

@ -639,7 +639,8 @@ static int chachapoly_setkey(struct crypto_aead *aead, const u8 *key,
if (keylen != CHACHA_KEY_SIZE + saltlen) if (keylen != CHACHA_KEY_SIZE + saltlen)
return -EINVAL; return -EINVAL;
ctx->cdata.key_virt = key; memcpy(ctx->key, key, keylen);
ctx->cdata.key_virt = ctx->key;
ctx->cdata.keylen = keylen - saltlen; ctx->cdata.keylen = keylen - saltlen;
return chachapoly_set_sh_desc(aead); return chachapoly_set_sh_desc(aead);