Commit 30d3f45b authored Jan 19, 2022 by Herbert Xu Committed by Greg Kroah-Hartman Apr 15, 2022

crypto: authenc - Fix sleep in atomic context in decrypt_tail



[ Upstream commit 66eae850333d639fc278d6f915c6fc01499ea893 ]

The function crypto_authenc_decrypt_tail discards its flags
argument and always relies on the flags from the original request
when starting its sub-request.

This is clearly wrong as it may cause the SLEEPABLE flag to be
set when it shouldn't.

Fixes: 92d95ba9 ("crypto: authenc - Convert to new AEAD interface")
Reported-by: Corentin Labbe <clabbe.montjoie@gmail.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Tested-by: Corentin Labbe <clabbe.montjoie@gmail.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 9b190221

crypto/authenc.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -263,7 +263,7 @@ static int crypto_authenc_decrypt_tail(struct aead_request *req,
		dst = scatterwalk_ffwd(areq_ctx->dst, req->dst, req->assoclen);

		skcipher_request_set_tfm(skreq, ctx->enc);
		skcipher_request_set_callback(skreq, aead_request_flags(req),
		skcipher_request_set_callback(skreq, flags,
		req->base.complete, req->base.data);
		skcipher_request_set_crypt(skreq, src, dst,
		req->cryptlen - authsize, req->iv);