crypto: arm64/sha1-ce - prevent asm code finalization in final() path

Ard Biesheuvel · herbertx · commit bf7883ebcb9c · 2015-05-07T11:16:25.000+08:00
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 &lt;ard.biesheuvel@linaro.org&gt;
Signed-off-by: Herbert Xu &lt;herbert@gondor.apana.org.au&gt;
diff --git 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();

Original file line number	Diff line number	Diff line change
`@@ -74,6 +74,9 @@ static int sha1_ce_finup(struct shash_desc desc, const u8 data,`
`74`	`74`
`75`	`75`	`static int sha1_ce_final(struct shash_desc desc, u8 out)`
`76`	`76`	`{`
	`77`	`+ struct sha1_ce_state *sctx = shash_desc_ctx(desc);`
	`78`	`+`
	`79`	`+ sctx->finalize = 0;`
`77`	`80`	`kernel_neon_begin_partial(16);`
`78`	`81`	`sha1_base_do_finalize(desc, (sha1_block_fn *)sha1_ce_transform);`
`79`	`82`	`kernel_neon_end();`