]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
crypto: caam/qi2 - fix Chacha20 + Poly1305 self test failure
authorGaurav Jain <gaurav.jain@nxp.com>
Thu, 21 Sep 2023 09:44:44 +0000 (15:14 +0530)
committerHerbert Xu <herbert@gondor.apana.org.au>
Sun, 1 Oct 2023 08:28:15 +0000 (16:28 +0800)
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: c10a53367901 ("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>
drivers/crypto/caam/caamalg_qi2.c

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