diff options
author | Herbert Xu <herbert@gondor.apana.org.au> | 2016-05-04 17:52:56 +0800 |
---|---|---|
committer | Sasha Levin <sasha.levin@oracle.com> | 2016-05-17 17:30:20 -0400 |
commit | 82b612eb124f25fa66a35ad8675a4320520028fa (patch) | |
tree | f954e39b04b51ab647c924cc73c16ad29d526b80 /crypto | |
parent | cc0bcc57d1198aa6b3caea80b6341f99347d0b2d (diff) | |
download | linux-stable-82b612eb124f25fa66a35ad8675a4320520028fa.tar.gz linux-stable-82b612eb124f25fa66a35ad8675a4320520028fa.tar.bz2 linux-stable-82b612eb124f25fa66a35ad8675a4320520028fa.zip |
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>
Diffstat (limited to 'crypto')
-rw-r--r-- | crypto/ahash.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/ahash.c b/crypto/ahash.c index 51d48cd34884..46ab9099c330 100644 --- a/crypto/ahash.c +++ b/crypto/ahash.c @@ -68,8 +68,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) |