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-Tag: v4.1.12-92~22^2~6
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=65bcc66991e30081b6b3a24a51711c25508440b0;p=users%2Fjedix%2Flinux-maple.git

crypto: hash - Fix page length clamping in hash walk

[ Upstream commit 13f4bb78cf6a312bbdec367ba3da044b09bf0e29 ]

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: Sasha Levin <sasha.levin@oracle.com>
(cherry picked from commit 1669540814a1cf57ff50e037c5bf84f831ea4e09)
Signed-off-by: Todd Vierling <todd.vierling@oracle.com>
Reviewed-by: Ethan Zhao <ethan.zhao@oracle.com>
---

diff --git a/crypto/ahash.c b/crypto/ahash.c
index d19b52324cf52..dac1c24e9c3e5 100644
--- a/crypto/ahash.c
+++ b/crypto/ahash.c
@@ -69,8 +69,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)