projects/linux·commit 13f4bb78

crypto: hash - Fix page length clamping in hash walk

13f4bb78 · Herbert Xu <[email protected]> · 2016-05-04 17:52:56 +08:00

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: <[email protected]>
Reported-by: Steffen Klassert <[email protected]>
Signed-off-by: Herbert Xu <[email protected]>
Commit
13f4bb78cf6a312bbdec367ba3da044b09bf0e29
Parents
6dc5df71

Changes

1 files changed · +2 −1

FileStatusAddDelContent
crypto/ahash.cmodified+2−1View file

crypto/ahash.c

View file
diff --git a/crypto/ahash.c b/crypto/ahash.c
index 5fc1f17..3887a98 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)