Commit bb648291 authored Dec 15, 2018 by Eric Biggers Committed by Herbert Xu Dec 23, 2018

crypto: skcipher - add might_sleep() to skcipher_walk_virt()

skcipher_walk_virt() can still sleep even with atomic=true, since that
only affects the later calls to skcipher_walk_done(). But,
skcipher_walk_virt() only has to allocate memory for some input data
layouts, so incorrectly calling it with preemption disabled can go
undetected. Use might_sleep() so that it's detected reliably.

Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

parent f9c9bdb5

crypto/skcipher.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -474,6 +474,8 @@ int skcipher_walk_virt(struct skcipher_walk *walk,
		{
		int err;

		might_sleep_if(req->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP);

		walk->flags &= ~SKCIPHER_WALK_PHYS;

		err = skcipher_walk_skcipher(walk, req);

Admin message