Received-SPF: pass (google.com: domain of linux-crypto-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Mime-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset=UTF-8
Date:   Tue, 11 Jul 2023 02:12:22 +0300
Message-Id: <CTYVFFFI0SE9.2QXXQPRJW3AA3@suppilovahvero>
Cc:     "David Howells" <dhowells@redhat.com>,
        "David S. Miller" <davem@davemloft.net>,
        <keyrings@vger.kernel.org>, <linux-crypto@vger.kernel.org>,
        <kernel-janitors@vger.kernel.org>
Subject: Re: [PATCH] KEYS: asymmetric: Fix error codes
From:   "Jarkko Sakkinen" <jarkko@kernel.org>
To:     "Jarkko Sakkinen" <jarkko@kernel.org>,
        "Dan Carpenter" <dan.carpenter@linaro.org>,
        "Herbert Xu" <herbert@gondor.apana.org.au>
References: <c5e34c6a-da1e-4585-98c4-14701b0e093e@moroto.mountain>
 <CTYVE0G0D53P.Y8A7V3C9BW9O@suppilovahvero>
In-Reply-To: <CTYVE0G0D53P.Y8A7V3C9BW9O@suppilovahvero>
Precedence: bulk

On Tue Jul 11, 2023 at 2:10 AM EEST, Jarkko Sakkinen wrote:
> On Mon Jul 3, 2023 at 5:18 PM EEST, Dan Carpenter wrote:
> > These error paths should return the appropriate error codes instead of
> > returning success.
> >
> > Fixes: 63ba4d67594a ("KEYS: asymmetric: Use new crypto interface withou=
t scatterlists")
> > Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
> > ---
> >  crypto/asymmetric_keys/public_key.c | 20 +++++++++++++++-----
> >  1 file changed, 15 insertions(+), 5 deletions(-)
> >
> > diff --git a/crypto/asymmetric_keys/public_key.c b/crypto/asymmetric_ke=
ys/public_key.c
> > index e787598cb3f7..773e159dbbcb 100644
> > --- a/crypto/asymmetric_keys/public_key.c
> > +++ b/crypto/asymmetric_keys/public_key.c
> > @@ -185,8 +185,10 @@ static int software_key_query(const struct kernel_=
pkey_params *params,
> > =20
> >  	if (issig) {
> >  		sig =3D crypto_alloc_sig(alg_name, 0, 0);
> > -		if (IS_ERR(sig))
> > +		if (IS_ERR(sig)) {
> > +			ret =3D PTR_ERR(sig);
> >  			goto error_free_key;
> > +		}
> > =20
> >  		if (pkey->key_is_private)
> >  			ret =3D crypto_sig_set_privkey(sig, key, pkey->keylen);
> > @@ -208,8 +210,10 @@ static int software_key_query(const struct kernel_=
pkey_params *params,
> >  		}
> >  	} else {
> >  		tfm =3D crypto_alloc_akcipher(alg_name, 0, 0);
> > -		if (IS_ERR(tfm))
> > +		if (IS_ERR(tfm)) {
> > +			ret =3D PTR_ERR(tfm);
> >  			goto error_free_key;
> > +		}
> > =20
> >  		if (pkey->key_is_private)
> >  			ret =3D crypto_akcipher_set_priv_key(tfm, key, pkey->keylen);
> > @@ -300,8 +304,10 @@ static int software_key_eds_op(struct kernel_pkey_=
params *params,
> > =20
> >  	if (issig) {
> >  		sig =3D crypto_alloc_sig(alg_name, 0, 0);
> > -		if (IS_ERR(sig))
> > +		if (IS_ERR(sig)) {
> > +			ret =3D PTR_ERR(sig);
> >  			goto error_free_key;
> > +		}
> > =20
> >  		if (pkey->key_is_private)
> >  			ret =3D crypto_sig_set_privkey(sig, key, pkey->keylen);
> > @@ -313,8 +319,10 @@ static int software_key_eds_op(struct kernel_pkey_=
params *params,
> >  		ksz =3D crypto_sig_maxsize(sig);
> >  	} else {
> >  		tfm =3D crypto_alloc_akcipher(alg_name, 0, 0);
> > -		if (IS_ERR(tfm))
> > +		if (IS_ERR(tfm)) {
> > +			ret =3D PTR_ERR(tfm);
> >  			goto error_free_key;
> > +		}
> > =20
> >  		if (pkey->key_is_private)
> >  			ret =3D crypto_akcipher_set_priv_key(tfm, key, pkey->keylen);
> > @@ -411,8 +419,10 @@ int public_key_verify_signature(const struct publi=
c_key *pkey,
> > =20
> >  	key =3D kmalloc(pkey->keylen + sizeof(u32) * 2 + pkey->paramlen,
> >  		      GFP_KERNEL);
> > -	if (!key)
> > +	if (!key) {
> > +		ret =3D -ENOMEM;
> >  		goto error_free_tfm;
> > +	}
> > =20
> >  	memcpy(key, pkey->key, pkey->keylen);
> >  	ptr =3D key + pkey->keylen;
> > --=20
> > 2.39.2
>
> I'll pick this as I'm late with 6.5 PR.
>
> Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org>

Causes merge conflicts with my tree:

https://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git/

BR, Jarkko