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

Commit 1ba6c542 authored by Herbert Xu's avatar Herbert Xu Committed by Greg Kroah-Hartman
Browse files

crypto: algif_aead - Do not set MAY_BACKLOG on the async path 



commit cbdad1f246dd98e6c9c32a6e5212337f542aa7e0 upstream.

The async path cannot use MAY_BACKLOG because it is not meant to
block, which is what MAY_BACKLOG does.  On the other hand, both
the sync and async paths can make use of MAY_SLEEP.

Fixes: 83094e5e ("crypto: af_alg - add async support to...")
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c470dc53

crypto/algif_aead.c

+4 −3
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ static int crypto_aead_copy_sgl(struct crypto_skcipher *null_tfm, 
	SKCIPHER_REQUEST_ON_STACK(skreq, null_tfm);



	skcipher_request_set_tfm(skreq, null_tfm);

	skcipher_request_set_callback(skreq, CRYPTO_TFM_REQ_MAY_BACKLOG,

	skcipher_request_set_callback(skreq, CRYPTO_TFM_REQ_MAY_SLEEP,

				      NULL, NULL);

	skcipher_request_set_crypt(skreq, src, dst, len, NULL);
@@ -295,19 +295,20 @@ static int _aead_recvmsg(struct socket *sock, struct msghdr *msg, 
		areq->outlen = outlen;



		aead_request_set_callback(&areq->cra_u.aead_req,

					  CRYPTO_TFM_REQ_MAY_BACKLOG,

					  CRYPTO_TFM_REQ_MAY_SLEEP,

					  af_alg_async_cb, areq);

		err = ctx->enc ? crypto_aead_encrypt(&areq->cra_u.aead_req) :

				 crypto_aead_decrypt(&areq->cra_u.aead_req);



		/* AIO operation in progress */

		if (err == -EINPROGRESS || err == -EBUSY)

		if (err == -EINPROGRESS)

			return -EIOCBQUEUED;



		sock_put(sk);

	} else {

		/* Synchronous operation */

		aead_request_set_callback(&areq->cra_u.aead_req,

					  CRYPTO_TFM_REQ_MAY_SLEEP |

					  CRYPTO_TFM_REQ_MAY_BACKLOG,

					  crypto_req_done, &ctx->wait);

		err = crypto_wait_req(ctx->enc ?