From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Mon, 26 Mar 2018 00:53:25 +0000 (+0800)
Subject: crypto: ahash - Fix early termination in hash walk
X-Git-Tag: v4.19~1306^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=900a081f6912a8985dc15380ec912752cb66025a;p=platform%2Fkernel%2Flinux-rpi.git

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>
---

diff --git a/crypto/ahash.c b/crypto/ahash.c
index f732dd9..a64c143 100644
--- a/crypto/ahash.c
+++ b/crypto/ahash.c
@@ -92,13 +92,14 @@ 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;
 
-		return nbytes;
+		if (nbytes) {
+			walk->data += walk->offset;
+			return nbytes;
+		}
 	}
 
 	if (walk->flags & CRYPTO_ALG_ASYNC)