From: Ard Biesheuvel Date: Wed, 6 May 2015 13:54:31 +0000 (+0200) Subject: crypto: arm64/sha1-ce - prevent asm code finalization in final() path X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=bf7883ebcb9c0880b8f5d22c1435a3de15283f0a;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git crypto: arm64/sha1-ce - prevent asm code finalization in final() path 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 Signed-off-by: Herbert Xu --- diff --git a/arch/arm64/crypto/sha1-ce-glue.c b/arch/arm64/crypto/sha1-ce-glue.c index 114e7cc5de8c..aefda9868627 100644 --- a/arch/arm64/crypto/sha1-ce-glue.c +++ b/arch/arm64/crypto/sha1-ce-glue.c @@ -74,6 +74,9 @@ static int sha1_ce_finup(struct shash_desc *desc, const u8 *data, static int sha1_ce_final(struct shash_desc *desc, u8 *out) { + struct sha1_ce_state *sctx = shash_desc_ctx(desc); + + sctx->finalize = 0; kernel_neon_begin_partial(16); sha1_base_do_finalize(desc, (sha1_block_fn *)sha1_ce_transform); kernel_neon_end();