summaryrefslogtreecommitdiffstats
path: root/crypto/ahash.c
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2018-03-26 08:53:25 +0800
committerHerbert Xu <herbert@gondor.apana.org.au>2018-03-31 01:34:19 +0800
commit900a081f6912a8985dc15380ec912752cb66025a (patch)
treeb3f9eb9e790bac749c79a3102c3b61a9e9cdb4c1 /crypto/ahash.c
parenta2e5d408a46372b8fba9b1af592edc6fa3fc93a9 (diff)
downloadlinux-stable-900a081f6912a8985dc15380ec912752cb66025a.tar.gz
linux-stable-900a081f6912a8985dc15380ec912752cb66025a.tar.bz2
linux-stable-900a081f6912a8985dc15380ec912752cb66025a.zip
crypto: ahash - Fix early termination in hash walk
When we have an unaligned SG list entry where there is no leftover aligned data, the hash walk code will incorrectly return zero as if the entire SG list has been processed. This patch fixes it by moving onto the next page instead. Reported-by: Eli Cooper <elicooper@gmx.com> Cc: <stable@vger.kernel.org> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'crypto/ahash.c')
-rw-r--r--crypto/ahash.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/crypto/ahash.c b/crypto/ahash.c
index f732dd9dedf9..a64c143165b1 100644
--- a/crypto/ahash.c
+++ b/crypto/ahash.c
@@ -92,13 +92,14 @@ int crypto_hash_walk_done(struct crypto_hash_walk *walk, int err)
if (nbytes && walk->offset & alignmask && !err) {
walk->offset = ALIGN(walk->offset, alignmask + 1);
- walk->data += walk->offset;
-
nbytes = min(nbytes,
((unsigned int)(PAGE_SIZE)) - walk->offset);
walk->entrylen -= nbytes;
- return nbytes;
+ if (nbytes) {
+ walk->data += walk->offset;
+ return nbytes;
+ }
}
if (walk->flags & CRYPTO_ALG_ASYNC)