Commit 900a081f authored Mar 26, 2018 by 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: Eli Cooper <elicooper@gmx.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

parent a2e5d408

crypto/ahash.c

+4 −3

Original line number	Diff line number	Diff line
		@@ -92,14 +92,15 @@ int crypto_hash_walk_done(struct crypto_hash_walk *walk, int err)

		if (nbytes && walk->offset & alignmask && !err) {
		walk->offset = ALIGN(walk->offset, alignmask + 1);
		walk->data += walk->offset;

		nbytes = min(nbytes,
		((unsigned int)(PAGE_SIZE)) - walk->offset);
		walk->entrylen -= nbytes;

		if (nbytes) {
		walk->data += walk->offset;
		return nbytes;
		}
		}

		if (walk->flags & CRYPTO_ALG_ASYNC)
		kunmap(walk->pg);

Admin message