Reviewed-by: Gaurav Jain <gaurav.jain@xxxxxxx>
> -----Original Message-----
> From: chenridong <chenridong@xxxxxxxxxx>
> Sent: Monday, November 11, 2024 7:51 AM
> To: Chen Ridong <chenridong@xxxxxxxxxxxxxxx>; Horia Geanta
> <horia.geanta@xxxxxxx>; Pankaj Gupta <pankaj.gupta@xxxxxxx>; Gaurav
> Jain <gaurav.jain@xxxxxxx>; herbert@xxxxxxxxxxxxxxxxxxx;
> davem@xxxxxxxxxxxxx; tudor-dan.ambarus@xxxxxxx; Radu Andrei Alexe
> <radu.alexe@xxxxxxx>
> Cc: linux-crypto@xxxxxxxxxxxxxxx; wangweiyang2@xxxxxxxxxx
> Subject: [EXT] Re: [PATCH] crypto: caam - add error check to
> caam_rsa_set_priv_key_form
>
> 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 2024/11/4 20:15, Chen Ridong wrote:
> > From: Chen Ridong <chenridong@xxxxxxxxxx>
> >
> > The caam_rsa_set_priv_key_form did not check for memory allocation
> errors.
> > Add the checks to the caam_rsa_set_priv_key_form functions.
> >
> > Fixes: 52e26d77b8b3 ("crypto: caam - add support for RSA key form 2")
> > Signed-off-by: Chen Ridong <chenridong@xxxxxxxxxx>
> > ---
> > drivers/crypto/caam/caampkc.c | 11 +++++++----
> > 1 file changed, 7 insertions(+), 4 deletions(-)
> >
> > diff --git a/drivers/crypto/caam/caampkc.c
> > b/drivers/crypto/caam/caampkc.c index 887a5f2fb927..cb001aa1de66
> > 100644
> > --- a/drivers/crypto/caam/caampkc.c
> > +++ b/drivers/crypto/caam/caampkc.c
> > @@ -984,7 +984,7 @@ static int caam_rsa_set_pub_key(struct
> crypto_akcipher *tfm, const void *key,
> > return -ENOMEM;
> > }
> >
> > -static void caam_rsa_set_priv_key_form(struct caam_rsa_ctx *ctx,
> > +static int caam_rsa_set_priv_key_form(struct caam_rsa_ctx *ctx,
> > struct rsa_key *raw_key) {
> > struct caam_rsa_key *rsa_key = &ctx->key; @@ -994,7 +994,7 @@
> > static void caam_rsa_set_priv_key_form(struct caam_rsa_ctx *ctx,
> >
> > rsa_key->p = caam_read_raw_data(raw_key->p, &p_sz);
> > if (!rsa_key->p)
> > - return;
> > + return -ENOMEM;
> > rsa_key->p_sz = p_sz;
> >
> > rsa_key->q = caam_read_raw_data(raw_key->q, &q_sz); @@ -1029,7
> > +1029,7 @@ static void caam_rsa_set_priv_key_form(struct caam_rsa_ctx
> > *ctx,
> >
> > rsa_key->priv_form = FORM3;
> >
> > - return;
> > + return 0;
> >
> > free_dq:
> > kfree_sensitive(rsa_key->dq);
> > @@ -1043,6 +1043,7 @@ static void caam_rsa_set_priv_key_form(struct
> caam_rsa_ctx *ctx,
> > kfree_sensitive(rsa_key->q);
> > free_p:
> > kfree_sensitive(rsa_key->p);
> > + return -ENOMEM;
> > }
> >
> > static int caam_rsa_set_priv_key(struct crypto_akcipher *tfm, const
> > void *key, @@ -1088,7 +1089,9 @@ static int
> caam_rsa_set_priv_key(struct crypto_akcipher *tfm, const void *key,
> > rsa_key->e_sz = raw_key.e_sz;
> > rsa_key->n_sz = raw_key.n_sz;
> >
> > - caam_rsa_set_priv_key_form(ctx, &raw_key);
> > + ret = caam_rsa_set_priv_key_form(ctx, &raw_key);
> > + if (ret)
> > + goto err;
> >
> > return 0;
> >
>
> Friendly ping
>
> Best regards,
> Ridong
