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

Ard Biesheuvel · herbertx · commit ec59a65d694e · 2015-05-07T11:16:26.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/sha2-ce-glue.c b/arch/arm64/crypto/sha2-ce-glue.c
@@ -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();

Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,9 @@ static int sha256_ce_finup(struct shash_desc desc, const u8 data,`
`75`	`75`
`76`	`76`	`static int sha256_ce_final(struct shash_desc desc, u8 out)`
`77`	`77`	`{`
	`78`	`+ struct sha256_ce_state *sctx = shash_desc_ctx(desc);`
	`79`	`+`
	`80`	`+ sctx->finalize = 0;`
`78`	`81`	`kernel_neon_begin_partial(28);`
`79`	`82`	`sha256_base_do_finalize(desc, (sha256_block_fn *)sha2_ce_transform);`
`80`	`83`	`kernel_neon_end();`