]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
crypto: arm64/sha2-ce - prevent asm code finalization in final() path
authorArd Biesheuvel <ard.biesheuvel@linaro.org>
Wed, 6 May 2015 13:54:32 +0000 (15:54 +0200)
committerHerbert Xu <herbert@gondor.apana.org.au>
Thu, 7 May 2015 03:16:26 +0000 (11:16 +0800)
Ensure that the asm code finalization path is not triggered when
invoked via final(), since it already takes care of that itself.

Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
arch/arm64/crypto/sha2-ce-glue.c

index 1340e44c048beab91279b6dd317f10590a6f06b9..7cd587564a4176e902f12c7c7043b714caab48ea 100644 (file)
@@ -75,6 +75,9 @@ static int sha256_ce_finup(struct shash_desc *desc, const u8 *data,
 
 static int sha256_ce_final(struct shash_desc *desc, u8 *out)
 {
+       struct sha256_ce_state *sctx = shash_desc_ctx(desc);
+
+       sctx->finalize = 0;
        kernel_neon_begin_partial(28);
        sha256_base_do_finalize(desc, (sha256_block_fn *)sha2_ce_transform);
        kernel_neon_end();