Commit 900a081f authored by Herbert Xu's avatar Herbert Xu

crypto: ahash - Fix early termination in hash walk

When we have an unaligned SG list entry where there is no leftover
aligned data, the hash walk code will incorrectly return zero as if
the entire SG list has been processed.

This patch fixes it by moving onto the next page instead.
Reported-by: default avatarEli Cooper <elicooper@gmx.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent a2e5d408
...@@ -92,13 +92,14 @@ int crypto_hash_walk_done(struct crypto_hash_walk *walk, int err) ...@@ -92,13 +92,14 @@ int crypto_hash_walk_done(struct crypto_hash_walk *walk, int err)
if (nbytes && walk->offset & alignmask && !err) { if (nbytes && walk->offset & alignmask && !err) {
walk->offset = ALIGN(walk->offset, alignmask + 1); walk->offset = ALIGN(walk->offset, alignmask + 1);
walk->data += walk->offset;
nbytes = min(nbytes, nbytes = min(nbytes,
((unsigned int)(PAGE_SIZE)) - walk->offset); ((unsigned int)(PAGE_SIZE)) - walk->offset);
walk->entrylen -= nbytes; walk->entrylen -= nbytes;
return nbytes; if (nbytes) {
walk->data += walk->offset;
return nbytes;
}
} }
if (walk->flags & CRYPTO_ALG_ASYNC) if (walk->flags & CRYPTO_ALG_ASYNC)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment