diff options
author | Herbert Xu <herbert@gondor.apana.org.au> | 2016-02-03 08:39:27 -0500 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2016-02-06 02:23:55 -0500 |
commit | dad41997063723eaf5f77bc2015606a5a9bce320 (patch) | |
tree | c71b233fed1969b4905fda7acf7c782895aaef0f /crypto | |
parent | 6454c2b83f719057069777132b13949e4c6b6350 (diff) |
crypto: algif_skcipher - Do not set MAY_BACKLOG on the async path
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.
Cc: stable@vger.kernel.org
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
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 ef84353e0f24..28556fce4267 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, | |||
536 | sg_init_table(sreq->tsg, tx_nents); | 536 | sg_init_table(sreq->tsg, tx_nents); |
537 | memcpy(iv, ctx->iv, ivsize); | 537 | memcpy(iv, ctx->iv, ivsize); |
538 | skcipher_request_set_tfm(req, tfm); | 538 | skcipher_request_set_tfm(req, tfm); |
539 | skcipher_request_set_callback(req, CRYPTO_TFM_REQ_MAY_BACKLOG, | 539 | skcipher_request_set_callback(req, CRYPTO_TFM_REQ_MAY_SLEEP, |
540 | skcipher_async_cb, sreq); | 540 | skcipher_async_cb, sreq); |
541 | 541 | ||
542 | while (iov_iter_count(&msg->msg_iter)) { | 542 | while (iov_iter_count(&msg->msg_iter)) { |
@@ -950,7 +950,8 @@ static int skcipher_accept_parent_nokey(void *private, struct sock *sk) | |||
950 | ask->private = ctx; | 950 | ask->private = ctx; |
951 | 951 | ||
952 | skcipher_request_set_tfm(&ctx->req, skcipher); | 952 | skcipher_request_set_tfm(&ctx->req, skcipher); |
953 | skcipher_request_set_callback(&ctx->req, CRYPTO_TFM_REQ_MAY_BACKLOG, | 953 | skcipher_request_set_callback(&ctx->req, CRYPTO_TFM_REQ_MAY_SLEEP | |
954 | CRYPTO_TFM_REQ_MAY_BACKLOG, | ||
954 | af_alg_complete, &ctx->completion); | 955 | af_alg_complete, &ctx->completion); |
955 | 956 | ||
956 | sk->sk_destruct = skcipher_sock_destruct; | 957 | sk->sk_destruct = skcipher_sock_destruct; |