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;
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
In-Reply-To: <e25e423595ead12913c9d6444438d89d85270a37.1662430815.git.pliem@maxlinear.com>
References: <e25e423595ead12913c9d6444438d89d85270a37.1662430815.git.pliem@maxlinear.com>
Cc:     linux-crypto@vger.kernel.org, linux-lgm-soc@maxlinear.com,
        Peter Harliman Liem <pliem@maxlinear.com>
From:   Antoine Tenart <atenart@kernel.org>
Subject: Re: [PATCH v2] crypto: inside_secure - Change swab to swab32
To:     Peter Harliman Liem <pliem@maxlinear.com>,
        herbert@gondor.apana.org.au
Message-ID: <166247092562.3585.2129014831753921041@kwain>
Date:   Tue, 06 Sep 2022 15:28:45 +0200
Precedence: bulk

Quoting Peter Harliman Liem (2022-09-06 04:51:28)
> The use of swab() is causing failures in 64-bit arch, as it
> translates to __swab64() instead of the intended __swab32().
> It eventually causes wrong results in xcbcmac & cmac algo.
>=20
> Fixes: 78cf1c8bfcb8 ("crypto: inside-secure - Move ipad/opad into safexce=
l_context")
> Signed-off-by: Peter Harliman Liem <pliem@maxlinear.com>

Acked-by: Antoine Tenart <atenart@kernel.org>

Thanks!

> ---
> v2:
>  Add fixes tag
>=20
>  drivers/crypto/inside-secure/safexcel_hash.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
>=20
> diff --git a/drivers/crypto/inside-secure/safexcel_hash.c b/drivers/crypt=
o/inside-secure/safexcel_hash.c
> index bc60b5802256..2124416742f8 100644
> --- a/drivers/crypto/inside-secure/safexcel_hash.c
> +++ b/drivers/crypto/inside-secure/safexcel_hash.c
> @@ -383,7 +383,7 @@ static int safexcel_ahash_send_req(struct crypto_asyn=
c_request *async, int ring,
>                                         u32 x;
> =20
>                                         x =3D ipad[i] ^ ipad[i + 4];
> -                                       cache[i] ^=3D swab(x);
> +                                       cache[i] ^=3D swab32(x);
>                                 }
>                         }
>                         cache_len =3D AES_BLOCK_SIZE;
> @@ -821,7 +821,7 @@ static int safexcel_ahash_final(struct ahash_request =
*areq)
>                         u32 *result =3D (void *)areq->result;
> =20
>                         /* K3 */
> -                       result[i] =3D swab(ctx->base.ipad.word[i + 4]);
> +                       result[i] =3D swab32(ctx->base.ipad.word[i + 4]);
>                 }
>                 areq->result[0] ^=3D 0x80;                        // 10- =
padding
>                 crypto_cipher_encrypt_one(ctx->kaes, areq->result, areq->=
result);
> @@ -2106,7 +2106,7 @@ static int safexcel_xcbcmac_setkey(struct crypto_ah=
ash *tfm, const u8 *key,
>         crypto_cipher_encrypt_one(ctx->kaes, (u8 *)key_tmp + AES_BLOCK_SI=
ZE,
>                 "\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3\x3");
>         for (i =3D 0; i < 3 * AES_BLOCK_SIZE / sizeof(u32); i++)
> -               ctx->base.ipad.word[i] =3D swab(key_tmp[i]);
> +               ctx->base.ipad.word[i] =3D swab32(key_tmp[i]);
> =20
>         crypto_cipher_clear_flags(ctx->kaes, CRYPTO_TFM_REQ_MASK);
>         crypto_cipher_set_flags(ctx->kaes, crypto_ahash_get_flags(tfm) &
> @@ -2189,7 +2189,7 @@ static int safexcel_cmac_setkey(struct crypto_ahash=
 *tfm, const u8 *key,
>                 return ret;
> =20
>         for (i =3D 0; i < len / sizeof(u32); i++)
> -               ctx->base.ipad.word[i + 8] =3D swab(aes.key_enc[i]);
> +               ctx->base.ipad.word[i + 8] =3D swab32(aes.key_enc[i]);
> =20
>         /* precompute the CMAC key material */
>         crypto_cipher_clear_flags(ctx->kaes, CRYPTO_TFM_REQ_MASK);
> --=20
> 2.17.1
>=20