Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

crypto: ahash - Fix early termination in hash walk

Browse source 
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>
This commit is contained in:
Herbert Xu 2018-03-26 08:53:25 +08:00
parent a2e5d408a4
commit 900a081f69
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
crypto/ahash.c
View file

@ -92,13 +92,14 @@ int crypto_hash_walk_done(struct crypto_hash_walk *walk, int err)
if (nbytes && walk->offset & alignmask && !err) { if (nbytes && walk->offset & alignmask && !err) {
walk->offset = ALIGN(walk->offset, alignmask + 1); walk->offset = ALIGN(walk->offset, alignmask + 1);
walk->data += walk->offset;
nbytes = min(nbytes, nbytes = min(nbytes,
((unsigned int)(PAGE_SIZE)) - walk->offset); ((unsigned int)(PAGE_SIZE)) - walk->offset);
walk->entrylen -= nbytes; walk->entrylen -= nbytes;
return nbytes; if (nbytes) {
walk->data += walk->offset;
return nbytes;
}
} }
if (walk->flags & CRYPTO_ALG_ASYNC) if (walk->flags & CRYPTO_ALG_ASYNC)