Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cbb9bf65 authored by Szilveszter Ördög's avatar Szilveszter Ördög Committed by Herbert Xu
Browse files

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: default avatarSzilveszter Ördög <slipszi@gmail.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 77ba115c

crypto/ahash.c

+0 −1
Original line number Diff line number Diff line
@@ -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;