Received-SPF: pass (google.com: domain of linux-crypto+bounces-3923-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Precedence: bulk
Mime-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset=UTF-8
Date: Mon, 29 Apr 2024 13:14:15 +0300
Message-Id: <D0WIZTMRKHSJ.1Z4ZV54DLVWAB@kernel.org>
Cc: "Stefan Berger" <stefanb@linux.ibm.com>, <keyrings@vger.kernel.org>,
 <linux-crypto@vger.kernel.org>, <herbert@gondor.apana.org.au>,
 <davem@davemloft.net>, <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] crypto: ecc - Protect ecc_digits_from_bytes from
 reading too many bytes
From: "Jarkko Sakkinen" <jarkko@kernel.org>
To: "Lukas Wunner" <lukas@wunner.de>
References: <20240426225553.3038070-1-stefanb@linux.ibm.com>
 <D0W3MTR0CY08.Q2UIYE4N274L@kernel.org> <Zi8UXS1MD5V58dnN@wunner.de>
In-Reply-To: <Zi8UXS1MD5V58dnN@wunner.de>

On Mon Apr 29, 2024 at 6:30 AM EEST, Lukas Wunner wrote:
> On Mon, Apr 29, 2024 at 01:12:00AM +0300, Jarkko Sakkinen wrote:
> > On Sat Apr 27, 2024 at 1:55 AM EEST, Stefan Berger wrote:
> > > Protect ecc_digits_from_bytes from reading too many bytes from the in=
put
> > > byte array in case an insufficient number of bytes is provided to fil=
l the
> > > output digit array of ndigits. Therefore, initialize the most signifi=
cant
> > > digits with 0 to avoid trying to read too many bytes later on.
> > >
> > > If too many bytes are provided on the input byte array the extra byte=
s
> > > are ignored since the input variable 'ndigits' limits the number of d=
igits
> > > that will be filled.
> > >
> > > Fixes: d67c96fb97b5 ("crypto: ecdsa - Convert byte arrays with key co=
ordinates to digits")
> > > Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
> > > ---
> > >  include/crypto/internal/ecc.h | 7 +++++++
> > >  1 file changed, 7 insertions(+)
> > >
> > > diff --git a/include/crypto/internal/ecc.h b/include/crypto/internal/=
ecc.h
> > > index 7ca1f463d1ec..56215f14ff96 100644
> > > --- a/include/crypto/internal/ecc.h
> > > +++ b/include/crypto/internal/ecc.h
> > > @@ -67,9 +67,16 @@ static inline void ecc_swap_digits(const void *in,=
 u64 *out, unsigned int ndigit
> > >  static inline void ecc_digits_from_bytes(const u8 *in, unsigned int =
nbytes,
> > >  					 u64 *out, unsigned int ndigits)
> > >  {
> > > +	int diff =3D ndigits - DIV_ROUND_UP(nbytes, sizeof(u64));
> > >  	unsigned int o =3D nbytes & 7;
> > >  	__be64 msd =3D 0;
> > > =20
> > > +	/* diff > 0: not enough input bytes: set most significant digits to=
 0 */
> > > +	while (diff > 0) {
> > > +		out[--ndigits] =3D 0;
> > > +		diff--;
> > > +	}
> >=20
> > Could be just trivial for-loop:
> >=20
> > for (i =3D 0; i < diff; i++)
> > 	out[--ndigits] =3D 0;
> >=20
> > Or also simpler while-loop could work:
> >=20
> > while (diff-- > 0)
> > 	out[--ndigits] =3D 0;
>
> Or just use memset(), which uses optimized instructions on many arches.

Yeah, sure, that would be even better, or even memzero_explicit()?

BR, Jarkko