From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Wed, 4 May 2016 09:52:56 +0000 (+0800)
Subject: crypto: hash - Fix page length clamping in hash walk
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f220ec58d1e4f49cb6c761a859241c057844cdf2;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

crypto: hash - Fix page length clamping in hash walk

commit 13f4bb78cf6a312bbdec367ba3da044b09bf0e29 upstream.

The crypto hash walk code is broken when supplied with an offset
greater than or equal to PAGE_SIZE.  This patch fixes it by adjusting
walk->pg and walk->offset when this happens.

Cc: <stable@vger.kernel.org>
Reported-by: Steffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Willy Tarreau <w@1wt.eu>
---

diff --git a/crypto/ahash.c b/crypto/ahash.c
index 857ae2b2a2a2..bcd5efc7eb4c 100644
--- a/crypto/ahash.c
+++ b/crypto/ahash.c
@@ -64,8 +64,9 @@ static int hash_walk_new_entry(struct crypto_hash_walk *walk)
 	struct scatterlist *sg;
 
 	sg = walk->sg;
-	walk->pg = sg_page(sg);
 	walk->offset = sg->offset;
+	walk->pg = sg_page(walk->sg) + (walk->offset >> PAGE_SHIFT);
+	walk->offset = offset_in_page(walk->offset);
 	walk->entrylen = sg->length;
 
 	if (walk->entrylen > walk->total)