linux-crypto.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v2] crypto: arm64: CE: implement export/import
@ 2020-02-24 14:47 Corentin Labbe
  2020-02-24 15:18 ` Ard Biesheuvel
  2020-03-06  1:48 ` Herbert Xu
  0 siblings, 2 replies; 3+ messages in thread
From: Corentin Labbe @ 2020-02-24 14:47 UTC (permalink / raw)
  To: ard.biesheuvel, catalin.marinas, davem, herbert, will, ebiggers
  Cc: linux-arm-kernel, linux-crypto, linux-kernel, Corentin Labbe

When an ahash algorithm fallback to another ahash and that fallback is
shaXXX-CE, doing export/import lead to error like this:
alg: ahash: sha1-sun8i-ce export() overran state buffer on test vector 0, cfg=\"import/export\"

This is due to the descsize of shaxxx-ce being larger than struct shaxxx_state
off by an u32.
For fixing this, let's implement export/import which rip the finalize
variant instead of using generic export/import.

Fixes: 6ba6c74dfc6b ("arm64/crypto: SHA-224/SHA-256 using ARMv8 Crypto Extensions")
Fixes: 2c98833a42cd ("arm64/crypto: SHA-1 using ARMv8 Crypto Extensions")

Signed-off-by: Corentin Labbe <clabbe@baylibre.com>
---
Changes since v1:
- memcpy directly &sctx->sst instead of sctx. As suggested by Eric Biggers

 arch/arm64/crypto/sha1-ce-glue.c | 20 ++++++++++++++++++++
 arch/arm64/crypto/sha2-ce-glue.c | 23 +++++++++++++++++++++++
 2 files changed, 43 insertions(+)

diff --git a/arch/arm64/crypto/sha1-ce-glue.c b/arch/arm64/crypto/sha1-ce-glue.c
index 63c875d3314b..565ef604ca04 100644
--- a/arch/arm64/crypto/sha1-ce-glue.c
+++ b/arch/arm64/crypto/sha1-ce-glue.c
@@ -91,12 +91,32 @@ static int sha1_ce_final(struct shash_desc *desc, u8 *out)
 	return sha1_base_finish(desc, out);
 }
 
+static int sha1_ce_export(struct shash_desc *desc, void *out)
+{
+	struct sha1_ce_state *sctx = shash_desc_ctx(desc);
+
+	memcpy(out, &sctx->sst, sizeof(struct sha1_state));
+	return 0;
+}
+
+static int sha1_ce_import(struct shash_desc *desc, const void *in)
+{
+	struct sha1_ce_state *sctx = shash_desc_ctx(desc);
+
+	memcpy(&sctx->sst, in, sizeof(struct sha1_state));
+	sctx->finalize = 0;
+	return 0;
+}
+
 static struct shash_alg alg = {
 	.init			= sha1_base_init,
 	.update			= sha1_ce_update,
 	.final			= sha1_ce_final,
 	.finup			= sha1_ce_finup,
+	.import			= sha1_ce_import,
+	.export			= sha1_ce_export,
 	.descsize		= sizeof(struct sha1_ce_state),
+	.statesize		= sizeof(struct sha1_state),
 	.digestsize		= SHA1_DIGEST_SIZE,
 	.base			= {
 		.cra_name		= "sha1",
diff --git a/arch/arm64/crypto/sha2-ce-glue.c b/arch/arm64/crypto/sha2-ce-glue.c
index a8e67bafba3d..9450d19b9e6e 100644
--- a/arch/arm64/crypto/sha2-ce-glue.c
+++ b/arch/arm64/crypto/sha2-ce-glue.c
@@ -109,12 +109,32 @@ static int sha256_ce_final(struct shash_desc *desc, u8 *out)
 	return sha256_base_finish(desc, out);
 }
 
+static int sha256_ce_export(struct shash_desc *desc, void *out)
+{
+	struct sha256_ce_state *sctx = shash_desc_ctx(desc);
+
+	memcpy(out, &sctx->sst, sizeof(struct sha256_state));
+	return 0;
+}
+
+static int sha256_ce_import(struct shash_desc *desc, const void *in)
+{
+	struct sha256_ce_state *sctx = shash_desc_ctx(desc);
+
+	memcpy(&sctx->sst, in, sizeof(struct sha256_state));
+	sctx->finalize = 0;
+	return 0;
+}
+
 static struct shash_alg algs[] = { {
 	.init			= sha224_base_init,
 	.update			= sha256_ce_update,
 	.final			= sha256_ce_final,
 	.finup			= sha256_ce_finup,
+	.export			= sha256_ce_export,
+	.import			= sha256_ce_import,
 	.descsize		= sizeof(struct sha256_ce_state),
+	.statesize		= sizeof(struct sha256_state),
 	.digestsize		= SHA224_DIGEST_SIZE,
 	.base			= {
 		.cra_name		= "sha224",
@@ -128,7 +148,10 @@ static struct shash_alg algs[] = { {
 	.update			= sha256_ce_update,
 	.final			= sha256_ce_final,
 	.finup			= sha256_ce_finup,
+	.export			= sha256_ce_export,
+	.import			= sha256_ce_import,
 	.descsize		= sizeof(struct sha256_ce_state),
+	.statesize		= sizeof(struct sha256_state),
 	.digestsize		= SHA256_DIGEST_SIZE,
 	.base			= {
 		.cra_name		= "sha256",
-- 
2.24.1


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH v2] crypto: arm64: CE: implement export/import
  2020-02-24 14:47 [PATCH v2] crypto: arm64: CE: implement export/import Corentin Labbe
@ 2020-02-24 15:18 ` Ard Biesheuvel
  2020-03-06  1:48 ` Herbert Xu
  1 sibling, 0 replies; 3+ messages in thread
From: Ard Biesheuvel @ 2020-02-24 15:18 UTC (permalink / raw)
  To: Corentin Labbe
  Cc: Catalin Marinas, David S. Miller, Herbert Xu, Will Deacon,
	Eric Biggers, linux-arm-kernel,
	open list:HARDWARE RANDOM NUMBER GENERATOR CORE,
	Linux Kernel Mailing List

On Mon, 24 Feb 2020 at 15:47, Corentin Labbe <clabbe@baylibre.com> wrote:
>
> When an ahash algorithm fallback to another ahash and that fallback is
> shaXXX-CE, doing export/import lead to error like this:
> alg: ahash: sha1-sun8i-ce export() overran state buffer on test vector 0, cfg=\"import/export\"
>
> This is due to the descsize of shaxxx-ce being larger than struct shaxxx_state
> off by an u32.
> For fixing this, let's implement export/import which rip the finalize
> variant instead of using generic export/import.
>
> Fixes: 6ba6c74dfc6b ("arm64/crypto: SHA-224/SHA-256 using ARMv8 Crypto Extensions")
> Fixes: 2c98833a42cd ("arm64/crypto: SHA-1 using ARMv8 Crypto Extensions")
>
> Signed-off-by: Corentin Labbe <clabbe@baylibre.com>

Reviewed-by: Ard Biesheuvel <ardb@kernel.org>

> ---
> Changes since v1:
> - memcpy directly &sctx->sst instead of sctx. As suggested by Eric Biggers
>
>  arch/arm64/crypto/sha1-ce-glue.c | 20 ++++++++++++++++++++
>  arch/arm64/crypto/sha2-ce-glue.c | 23 +++++++++++++++++++++++
>  2 files changed, 43 insertions(+)
>
> diff --git a/arch/arm64/crypto/sha1-ce-glue.c b/arch/arm64/crypto/sha1-ce-glue.c
> index 63c875d3314b..565ef604ca04 100644
> --- a/arch/arm64/crypto/sha1-ce-glue.c
> +++ b/arch/arm64/crypto/sha1-ce-glue.c
> @@ -91,12 +91,32 @@ static int sha1_ce_final(struct shash_desc *desc, u8 *out)
>         return sha1_base_finish(desc, out);
>  }
>
> +static int sha1_ce_export(struct shash_desc *desc, void *out)
> +{
> +       struct sha1_ce_state *sctx = shash_desc_ctx(desc);
> +
> +       memcpy(out, &sctx->sst, sizeof(struct sha1_state));
> +       return 0;
> +}
> +
> +static int sha1_ce_import(struct shash_desc *desc, const void *in)
> +{
> +       struct sha1_ce_state *sctx = shash_desc_ctx(desc);
> +
> +       memcpy(&sctx->sst, in, sizeof(struct sha1_state));
> +       sctx->finalize = 0;
> +       return 0;
> +}
> +
>  static struct shash_alg alg = {
>         .init                   = sha1_base_init,
>         .update                 = sha1_ce_update,
>         .final                  = sha1_ce_final,
>         .finup                  = sha1_ce_finup,
> +       .import                 = sha1_ce_import,
> +       .export                 = sha1_ce_export,
>         .descsize               = sizeof(struct sha1_ce_state),
> +       .statesize              = sizeof(struct sha1_state),
>         .digestsize             = SHA1_DIGEST_SIZE,
>         .base                   = {
>                 .cra_name               = "sha1",
> diff --git a/arch/arm64/crypto/sha2-ce-glue.c b/arch/arm64/crypto/sha2-ce-glue.c
> index a8e67bafba3d..9450d19b9e6e 100644
> --- a/arch/arm64/crypto/sha2-ce-glue.c
> +++ b/arch/arm64/crypto/sha2-ce-glue.c
> @@ -109,12 +109,32 @@ static int sha256_ce_final(struct shash_desc *desc, u8 *out)
>         return sha256_base_finish(desc, out);
>  }
>
> +static int sha256_ce_export(struct shash_desc *desc, void *out)
> +{
> +       struct sha256_ce_state *sctx = shash_desc_ctx(desc);
> +
> +       memcpy(out, &sctx->sst, sizeof(struct sha256_state));
> +       return 0;
> +}
> +
> +static int sha256_ce_import(struct shash_desc *desc, const void *in)
> +{
> +       struct sha256_ce_state *sctx = shash_desc_ctx(desc);
> +
> +       memcpy(&sctx->sst, in, sizeof(struct sha256_state));
> +       sctx->finalize = 0;
> +       return 0;
> +}
> +
>  static struct shash_alg algs[] = { {
>         .init                   = sha224_base_init,
>         .update                 = sha256_ce_update,
>         .final                  = sha256_ce_final,
>         .finup                  = sha256_ce_finup,
> +       .export                 = sha256_ce_export,
> +       .import                 = sha256_ce_import,
>         .descsize               = sizeof(struct sha256_ce_state),
> +       .statesize              = sizeof(struct sha256_state),
>         .digestsize             = SHA224_DIGEST_SIZE,
>         .base                   = {
>                 .cra_name               = "sha224",
> @@ -128,7 +148,10 @@ static struct shash_alg algs[] = { {
>         .update                 = sha256_ce_update,
>         .final                  = sha256_ce_final,
>         .finup                  = sha256_ce_finup,
> +       .export                 = sha256_ce_export,
> +       .import                 = sha256_ce_import,
>         .descsize               = sizeof(struct sha256_ce_state),
> +       .statesize              = sizeof(struct sha256_state),
>         .digestsize             = SHA256_DIGEST_SIZE,
>         .base                   = {
>                 .cra_name               = "sha256",
> --
> 2.24.1
>

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH v2] crypto: arm64: CE: implement export/import
  2020-02-24 14:47 [PATCH v2] crypto: arm64: CE: implement export/import Corentin Labbe
  2020-02-24 15:18 ` Ard Biesheuvel
@ 2020-03-06  1:48 ` Herbert Xu
  1 sibling, 0 replies; 3+ messages in thread
From: Herbert Xu @ 2020-03-06  1:48 UTC (permalink / raw)
  To: Corentin Labbe
  Cc: ard.biesheuvel, catalin.marinas, davem, will, ebiggers,
	linux-arm-kernel, linux-crypto, linux-kernel

On Mon, Feb 24, 2020 at 02:47:41PM +0000, Corentin Labbe wrote:
> When an ahash algorithm fallback to another ahash and that fallback is
> shaXXX-CE, doing export/import lead to error like this:
> alg: ahash: sha1-sun8i-ce export() overran state buffer on test vector 0, cfg=\"import/export\"
> 
> This is due to the descsize of shaxxx-ce being larger than struct shaxxx_state
> off by an u32.
> For fixing this, let's implement export/import which rip the finalize
> variant instead of using generic export/import.
> 
> Fixes: 6ba6c74dfc6b ("arm64/crypto: SHA-224/SHA-256 using ARMv8 Crypto Extensions")
> Fixes: 2c98833a42cd ("arm64/crypto: SHA-1 using ARMv8 Crypto Extensions")
> 
> Signed-off-by: Corentin Labbe <clabbe@baylibre.com>
> ---
> Changes since v1:
> - memcpy directly &sctx->sst instead of sctx. As suggested by Eric Biggers
> 
>  arch/arm64/crypto/sha1-ce-glue.c | 20 ++++++++++++++++++++
>  arch/arm64/crypto/sha2-ce-glue.c | 23 +++++++++++++++++++++++
>  2 files changed, 43 insertions(+)

Patch applied.  Thanks.
-- 
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2020-03-06  1:48 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-02-24 14:47 [PATCH v2] crypto: arm64: CE: implement export/import Corentin Labbe
2020-02-24 15:18 ` Ard Biesheuvel
2020-03-06  1:48 ` Herbert Xu

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).