Skip to content

Commit 9e5f7a1

Browse files
Romain Perierherbertx
authored andcommitted
crypto: marvell - Don't corrupt state of an STD req for re-stepped ahash
mv_cesa_hash_std_step() copies the creq->state into the SRAM at each step, but this is only required on the first one. By doing that, we overwrite the engine state, and get erroneous results when the crypto request is split in several chunks to fit in the internal SRAM. This commit changes the function to copy the state only on the first step. Fixes: commit 2786cee ("crypto: marvell - Move SRAM I/O op...") Signed-off-by: Romain Perier <[email protected]> Cc: <[email protected]> Signed-off-by: Herbert Xu <[email protected]>
1 parent 68c7f8c commit 9e5f7a1

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

drivers/crypto/marvell/hash.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -168,9 +168,11 @@ static void mv_cesa_ahash_std_step(struct ahash_request *req)
168168
mv_cesa_adjust_op(engine, &creq->op_tmpl);
169169
memcpy_toio(engine->sram, &creq->op_tmpl, sizeof(creq->op_tmpl));
170170

171-
digsize = crypto_ahash_digestsize(crypto_ahash_reqtfm(req));
172-
for (i = 0; i < digsize / 4; i++)
173-
writel_relaxed(creq->state[i], engine->regs + CESA_IVDIG(i));
171+
if (!sreq->offset) {
172+
digsize = crypto_ahash_digestsize(crypto_ahash_reqtfm(req));
173+
for (i = 0; i < digsize / 4; i++)
174+
writel_relaxed(creq->state[i], engine->regs + CESA_IVDIG(i));
175+
}
174176

175177
if (creq->cache_ptr)
176178
memcpy_toio(engine->sram + CESA_SA_DATA_SRAM_OFFSET,

0 commit comments

Comments
 (0)