diff options
author | Herbert Xu <herbert@gondor.apana.org.au> | 2016-05-04 17:52:56 +0800 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2016-05-05 14:27:04 +0800 |
commit | 085966b9cf957d585818b4d547a3ebf1e7775755 (patch) | |
tree | 6177565afd06ea7e47be5a7d5b883fa74b175873 /crypto | |
parent | 6b45e51c0af7703db90b6aa8b440261d2b88e713 (diff) | |
download | linux-crypto-085966b9cf957d585818b4d547a3ebf1e7775755.tar.gz linux-crypto-085966b9cf957d585818b4d547a3ebf1e7775755.zip |
crypto: hash - Fix page length clamping in hash walk
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>
Diffstat (limited to '')
-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 5fc1f172..3887a98a 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) |