summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSzilveszter Ördög <slipszi@gmail.com>2010-03-03 08:03:23 +0800
committerHerbert Xu <herbert@gondor.apana.org.au>2010-03-03 08:03:23 +0800
commitcbb9bf65ae25dee772e85589136e7dd1c3e743ae (patch)
tree3dbb72e204bdcd15d7a36f27ef28f056b1367965
parent77ba115c478d442024964b217f9f12192018cc77 (diff)
downloadop-kernel-dev-cbb9bf65ae25dee772e85589136e7dd1c3e743ae.zip
op-kernel-dev-cbb9bf65ae25dee772e85589136e7dd1c3e743ae.tar.gz
crypto: hash - Fix handling of unaligned buffers
The correct way to calculate the start of the aligned part of an unaligned buffer is: offset = ALIGN(offset, alignmask + 1); However, crypto_hash_walk_done() has: offset += alignmask - 1; offset = ALIGN(offset, alignmask + 1); which actually skips a whole block unless offset % (alignmask + 1) == 1. This patch fixes the problem. Signed-off-by: Szilveszter Ördög <slipszi@gmail.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-rw-r--r--crypto/ahash.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/crypto/ahash.c b/crypto/ahash.c
index 33a4ff4..b8c59b8 100644
--- a/crypto/ahash.c
+++ b/crypto/ahash.c
@@ -78,7 +78,6 @@ int crypto_hash_walk_done(struct crypto_hash_walk *walk, int err)
walk->data -= walk->offset;
if (nbytes && walk->offset & alignmask && !err) {
- walk->offset += alignmask - 1;
walk->offset = ALIGN(walk->offset, alignmask + 1);
walk->data += walk->offset;
OpenPOWER on IntegriCloud