diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2016-05-04 17:52:56 +0800 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2016-06-15 21:28:14 +0100 |
| commit | 05c5678247404392ef9b0e57b1f1250a50db0aa7 (patch) | |
| tree | ba6ffb88d031d2b43c46969ce610e0f564c7696e | |
| parent | dd99371637aa1dca140c3f06e38a7abe708b45f1 (diff) | |
| download | linux-stable-05c5678247404392ef9b0e57b1f1250a50db0aa7.tar.gz linux-stable-05c5678247404392ef9b0e57b1f1250a50db0aa7.tar.bz2 linux-stable-05c5678247404392ef9b0e57b1f1250a50db0aa7.zip | |
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.
Reported-by: Steffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
| -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 7fd8ecf71337..8271185d4ad9 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) |