diff mbox series

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

Message ID 20230921124237.2364827-1-gaurav.jain@nxp.com
State New
Headers
Series crypto: caam/jr - fix Chacha20 + Poly1305 self test failure |

Commit Message

Gaurav Jain Sept. 21, 2023, 12:42 p.m. UTC 
  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: d6bbd4eea243 ("crypto: caam/jr - add support for Chacha20 + Poly1305")
Signed-off-by: Gaurav Jain <gaurav.jain@nxp.com>
---
 drivers/crypto/caam/caamalg.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Eric Biggers Sept. 22, 2023, 2:41 a.m. UTC | #1 
On Thu, Sep 21, 2023 at 06:12:37PM +0530, Gaurav Jain wrote:
> 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: d6bbd4eea243 ("crypto: caam/jr - add support for Chacha20 + Poly1305")
> Signed-off-by: Gaurav Jain <gaurav.jain@nxp.com>
> ---
>  drivers/crypto/caam/caamalg.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/crypto/caam/caamalg.c b/drivers/crypto/caam/caamalg.c
> index eba2d750c3b0..066f08a3a040 100644
> --- a/drivers/crypto/caam/caamalg.c
> +++ b/drivers/crypto/caam/caamalg.c
> @@ -575,7 +575,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;
>  

Huh, so this driver just ignored the key?  Is anyone using the ChaCha20Poly1305
support in this driver?  Based on this bug existing, that seems unlikely.  If
that's the case, wouldn't it be better just to remove the ChaCha20Poly1305
support from this driver so that the code doesn't need to be maintained?

- Eric
Gaurav Jain Sept. 22, 2023, 6:34 a.m. UTC | #2 
Hi Eric

> -----Original Message-----
> From: Eric Biggers <ebiggers@kernel.org>
> Sent: Friday, September 22, 2023 8:11 AM
> To: Gaurav Jain <gaurav.jain@nxp.com>
> Cc: Horia Geanta <horia.geanta@nxp.com>; Pankaj Gupta
> <pankaj.gupta@nxp.com>; Varun Sethi <V.Sethi@nxp.com>; Meenakshi
> Aggarwal <meenakshi.aggarwal@nxp.com>; Herbert Xu
> <herbert@gondor.apana.org.au>; David S . Miller <davem@davemloft.net>;
> Aisheng Dong <aisheng.dong@nxp.com>; Silvano Di Ninno
> <silvano.dininno@nxp.com>; linux-crypto@vger.kernel.org; linux-
> kernel@vger.kernel.org; dl-linux-imx <linux-imx@nxp.com>
> Subject: [EXT] Re: [PATCH] crypto: caam/jr - fix Chacha20 + Poly1305 self test
> failure
> 
> Caution: This is an external email. Please take care when clicking links or
> opening attachments. When in doubt, report the message using the 'Report this
> email' button
> 
> 
> On Thu, Sep 21, 2023 at 06:12:37PM +0530, Gaurav Jain wrote:
> > 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: d6bbd4eea243 ("crypto: caam/jr - add support for Chacha20 +
> > Poly1305")
> > Signed-off-by: Gaurav Jain <gaurav.jain@nxp.com>
> > ---
> >  drivers/crypto/caam/caamalg.c | 3 ++-
> >  1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/crypto/caam/caamalg.c
> > b/drivers/crypto/caam/caamalg.c index eba2d750c3b0..066f08a3a040
> > 100644
> > --- a/drivers/crypto/caam/caamalg.c
> > +++ b/drivers/crypto/caam/caamalg.c
> > @@ -575,7 +575,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;
> >
> 
> Huh, so this driver just ignored the key?  Is anyone using the ChaCha20Poly1305
> support in this driver?  Based on this bug existing, that seems unlikely.  If that's
> the case, wouldn't it be better just to remove the ChaCha20Poly1305 support
> from this driver so that the code doesn't need to be maintained?

This algorithm is used in IPSEC and we are also going to use ChaCha20Poly1305 support for Kernel TLS.
Gaurav
> 
> - Eric
Kamlesh Gurudasani Sept. 22, 2023, 7:17 a.m. UTC | #3 
Gaurav Jain <gaurav.jain@nxp.com> writes:

> Hi Eric
>
>> -----Original Message-----
>> From: Eric Biggers <ebiggers@kernel.org>
>> Sent: Friday, September 22, 2023 8:11 AM
>> To: Gaurav Jain <gaurav.jain@nxp.com>
>> Cc: Horia Geanta <horia.geanta@nxp.com>; Pankaj Gupta
>> <pankaj.gupta@nxp.com>; Varun Sethi <V.Sethi@nxp.com>; Meenakshi
>> Aggarwal <meenakshi.aggarwal@nxp.com>; Herbert Xu
>> <herbert@gondor.apana.org.au>; David S . Miller <davem@davemloft.net>;
>> Aisheng Dong <aisheng.dong@nxp.com>; Silvano Di Ninno
>> <silvano.dininno@nxp.com>; linux-crypto@vger.kernel.org; linux-
>> kernel@vger.kernel.org; dl-linux-imx <linux-imx@nxp.com>
>> Subject: [EXT] Re: [PATCH] crypto: caam/jr - fix Chacha20 + Poly1305 self test
>> failure
>> 
>> Caution: This is an external email. Please take care when clicking links or
>> opening attachments. When in doubt, report the message using the 'Report this
>> email' button
>> 
>> 
>> On Thu, Sep 21, 2023 at 06:12:37PM +0530, Gaurav Jain wrote:
>> > 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
Not sure, but do you mean array*?

>> >
>> > Fixes: d6bbd4eea243 ("crypto: caam/jr - add support for Chacha20 +
>> > Poly1305")
>> > Signed-off-by: Gaurav Jain <gaurav.jain@nxp.com>
>> > ---
>> >  drivers/crypto/caam/caamalg.c | 3 ++-
>> >  1 file changed, 2 insertions(+), 1 deletion(-)
>> >
>> > diff --git a/drivers/crypto/caam/caamalg.c
>> > b/drivers/crypto/caam/caamalg.c index eba2d750c3b0..066f08a3a040
>> > 100644
>> > --- a/drivers/crypto/caam/caamalg.c
>> > +++ b/drivers/crypto/caam/caamalg.c
>> > @@ -575,7 +575,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;
>> >
>> 
>> Huh, so this driver just ignored the key?  Is anyone using the ChaCha20Poly1305
>> support in this driver?  Based on this bug existing, that seems unlikely.  If that's
>> the case, wouldn't it be better just to remove the ChaCha20Poly1305 support
>> from this driver so that the code doesn't need to be maintained?
>
> This algorithm is used in IPSEC and we are also going to use ChaCha20Poly1305 support for Kernel TLS.
> Gaurav
Does this mean IPSEC doesn't call setkey() or the key value was such
that it didn't affect even after failing to actually set the key?

-Kamlesh
Gaurav Jain Sept. 25, 2023, 9:03 a.m. UTC | #4 
Hi Kamlesh

> -----Original Message-----
> From: Kamlesh Gurudasani <kamlesh@ti.com>
> Sent: Friday, September 22, 2023 12:47 PM
> To: Gaurav Jain <gaurav.jain@nxp.com>; Eric Biggers <ebiggers@kernel.org>
> Cc: Horia Geanta <horia.geanta@nxp.com>; Pankaj Gupta
> <pankaj.gupta@nxp.com>; Varun Sethi <V.Sethi@nxp.com>; Meenakshi
> Aggarwal <meenakshi.aggarwal@nxp.com>; Herbert Xu
> <herbert@gondor.apana.org.au>; David S . Miller <davem@davemloft.net>;
> Aisheng Dong <aisheng.dong@nxp.com>; Silvano Di Ninno
> <silvano.dininno@nxp.com>; linux-crypto@vger.kernel.org; linux-
> kernel@vger.kernel.org; dl-linux-imx <linux-imx@nxp.com>
> Subject: Re: [EXTERNAL] RE: [EXT] Re: [PATCH] crypto: caam/jr - fix Chacha20 +
> Poly1305 self test failure
> 
> Caution: This is an external email. Please take care when clicking links or
> opening attachments. When in doubt, report the message using the 'Report this
> email' button
> 
> 
> Gaurav Jain <gaurav.jain@nxp.com> writes:
> 
> > Hi Eric
> >
> >> -----Original Message-----
> >> From: Eric Biggers <ebiggers@kernel.org>
> >> Sent: Friday, September 22, 2023 8:11 AM
> >> To: Gaurav Jain <gaurav.jain@nxp.com>
> >> Cc: Horia Geanta <horia.geanta@nxp.com>; Pankaj Gupta
> >> <pankaj.gupta@nxp.com>; Varun Sethi <V.Sethi@nxp.com>; Meenakshi
> >> Aggarwal <meenakshi.aggarwal@nxp.com>; Herbert Xu
> >> <herbert@gondor.apana.org.au>; David S . Miller
> >> <davem@davemloft.net>; Aisheng Dong <aisheng.dong@nxp.com>; Silvano
> >> Di Ninno <silvano.dininno@nxp.com>; linux-crypto@vger.kernel.org;
> >> linux- kernel@vger.kernel.org; dl-linux-imx <linux-imx@nxp.com>
> >> Subject: [EXT] Re: [PATCH] crypto: caam/jr - fix Chacha20 + Poly1305
> >> self test failure
> >>
> >> Caution: This is an external email. Please take care when clicking
> >> links or opening attachments. When in doubt, report the message using
> >> the 'Report this email' button
> >>
> >>
> >> On Thu, Sep 21, 2023 at 06:12:37PM +0530, Gaurav Jain wrote:
> >> > 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
> Not sure, but do you mean array*?
> 
> >> >
> >> > Fixes: d6bbd4eea243 ("crypto: caam/jr - add support for Chacha20 +
> >> > Poly1305")
> >> > Signed-off-by: Gaurav Jain <gaurav.jain@nxp.com>
> >> > ---
> >> >  drivers/crypto/caam/caamalg.c | 3 ++-
> >> >  1 file changed, 2 insertions(+), 1 deletion(-)
> >> >
> >> > diff --git a/drivers/crypto/caam/caamalg.c
> >> > b/drivers/crypto/caam/caamalg.c index eba2d750c3b0..066f08a3a040
> >> > 100644
> >> > --- a/drivers/crypto/caam/caamalg.c
> >> > +++ b/drivers/crypto/caam/caamalg.c
> >> > @@ -575,7 +575,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;
> >> >
> >>
> >> Huh, so this driver just ignored the key?  Is anyone using the
> >> ChaCha20Poly1305 support in this driver?  Based on this bug existing,
> >> that seems unlikely.  If that's the case, wouldn't it be better just
> >> to remove the ChaCha20Poly1305 support from this driver so that the code
> doesn't need to be maintained?
> >
> > This algorithm is used in IPSEC and we are also going to use
> ChaCha20Poly1305 support for Kernel TLS.
> > Gaurav
> Does this mean IPSEC doesn't call setkey() or the key value was such that it didn't
> affect even after failing to actually set the key?
Our test passed with older kernel versions, This issue was caught in testing with the latest kernel version only.

Regards
Gaurav 
> 
> -Kamlesh
Herbert Xu Oct. 1, 2023, 8:34 a.m. UTC | #5 
On Thu, Sep 21, 2023 at 06:12:37PM +0530, Gaurav Jain wrote:
> 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: d6bbd4eea243 ("crypto: caam/jr - add support for Chacha20 + Poly1305")
> Signed-off-by: Gaurav Jain <gaurav.jain@nxp.com>
> ---
>  drivers/crypto/caam/caamalg.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)

Patch applied.  Thanks.
diff mbox series

Patch

diff --git a/drivers/crypto/caam/caamalg.c b/drivers/crypto/caam/caamalg.c
index eba2d750c3b0..066f08a3a040 100644
--- a/drivers/crypto/caam/caamalg.c
+++ b/drivers/crypto/caam/caamalg.c
@@ -575,7 +575,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);