Commit c14ca838 authored Nov 23, 2017 by Ondrej Mosnáček Committed by Herbert Xu Nov 25, 2017

crypto: skcipher - Fix skcipher_walk_aead_common



The skcipher_walk_aead_common function calls scatterwalk_copychunks on
the input and output walks to skip the associated data. If the AD end
at an SG list entry boundary, then after these calls the walks will
still be pointing to the end of the skipped region.

These offsets are later checked for alignment in skcipher_walk_next,
so the skcipher_walk may detect the alignment incorrectly.

This patch fixes it by calling scatterwalk_done after the copychunks
calls to ensure that the offsets refer to the right SG list entry.

Fixes: b286d8b1 ("crypto: skcipher - Add skcipher walk interface")
Cc: <stable@vger.kernel.org>
Signed-off-by: Ondrej Mosnacek <omosnacek@gmail.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

parent 7d2c3f54

crypto/skcipher.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -517,6 +517,9 @@ static int skcipher_walk_aead_common(struct skcipher_walk *walk,
		scatterwalk_copychunks(NULL, &walk->in, req->assoclen, 2);
		scatterwalk_copychunks(NULL, &walk->out, req->assoclen, 2);

		scatterwalk_done(&walk->in, 0, walk->total);
		scatterwalk_done(&walk->out, 0, walk->total);

		walk->iv = req->iv;
		walk->oiv = req->iv;

Admin message