Commit eca68284 authored by Eric Biggers's avatar Eric Biggers Committed by Herbert Xu
Browse files

crypto: skcipher - fix mismatch between mapping and unmapping order 



Local kunmaps have to be unmapped in the opposite order from which they
were mapped.  My recent change flipped the unmap order in the
SKCIPHER_WALK_DIFF case.  Adjust the mapping side to match.

This fixes a WARN_ON_ONCE that was triggered when running the
crypto-self tests on a 32-bit kernel with
CONFIG_DEBUG_KMAP_LOCAL_FORCE_MAP=y.

Fixes: 95dbd711 ("crypto: skcipher - use the new scatterwalk functions")
Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 98330b9a

crypto/skcipher.c

+3 −3
Original line number Diff line number Diff line
@@ -209,12 +209,12 @@ static int skcipher_next_fast(struct skcipher_walk *walk) 
	diff |= (u8 *)(sg_page(walk->in.sg) + (walk->in.offset >> PAGE_SHIFT)) -

		(u8 *)(sg_page(walk->out.sg) + (walk->out.offset >> PAGE_SHIFT));



	skcipher_map_src(walk);

	walk->dst.virt.addr = walk->src.virt.addr;

	skcipher_map_dst(walk);

	walk->src.virt.addr = walk->dst.virt.addr;



	if (diff) {

		walk->flags |= SKCIPHER_WALK_DIFF;

		skcipher_map_dst(walk);

		skcipher_map_src(walk);

	}



	return 0;