diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2016-02-03 21:39:27 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-02-17 12:31:05 -0800 |
| commit | 12426bd6b05f286fe252ddb69c4aea3209d01d5b (patch) | |
| tree | 56a6a0a72ad043f2b03fcb8104ff83d691891813 /crypto | |
| parent | 66bca97f21762ba58ce3d6767b27f782c702ef65 (diff) | |
| download | linux-stable-12426bd6b05f286fe252ddb69c4aea3209d01d5b.tar.gz linux-stable-12426bd6b05f286fe252ddb69c4aea3209d01d5b.tar.bz2 linux-stable-12426bd6b05f286fe252ddb69c4aea3209d01d5b.zip | |
crypto: algif_skcipher - Do not set MAY_BACKLOG on the async path
commit dad41997063723eaf5f77bc2015606a5a9bce320 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.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/algif_skcipher.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/crypto/algif_skcipher.c b/crypto/algif_skcipher.c index a82804e2a9bd..f5e9f9310b48 100644 --- a/crypto/algif_skcipher.c +++ b/crypto/algif_skcipher.c @@ -536,7 +536,7 @@ static int skcipher_recvmsg_async(struct socket *sock, struct msghdr *msg, sg_init_table(sreq->tsg, tx_nents); memcpy(iv, ctx->iv, ivsize); skcipher_request_set_tfm(req, tfm); - skcipher_request_set_callback(req, CRYPTO_TFM_REQ_MAY_BACKLOG, + skcipher_request_set_callback(req, CRYPTO_TFM_REQ_MAY_SLEEP, skcipher_async_cb, sreq); while (iov_iter_count(&msg->msg_iter)) { @@ -950,7 +950,8 @@ static int skcipher_accept_parent_nokey(void *private, struct sock *sk) ask->private = ctx; skcipher_request_set_tfm(&ctx->req, skcipher); - skcipher_request_set_callback(&ctx->req, CRYPTO_TFM_REQ_MAY_BACKLOG, + skcipher_request_set_callback(&ctx->req, CRYPTO_TFM_REQ_MAY_SLEEP | + CRYPTO_TFM_REQ_MAY_BACKLOG, af_alg_complete, &ctx->completion); sk->sk_destruct = skcipher_sock_destruct; |