This is a note to let you know that I've just added the patch titled
crypto: algif_skcipher - Do not set MAY_BACKLOG on the async path
to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
crypto-algif_skcipher-do-not-set-may_backlog-on-the-async-path.patch
and it can be found in the queue-4.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From dad41997063723eaf5f77bc2015606a5a9bce320 Mon Sep 17 00:00:00 2001
From: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Date: Wed, 3 Feb 2016 21:39:27 +0800
Subject: crypto: algif_skcipher - Do not set MAY_BACKLOG on the async path
From: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
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@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
crypto/algif_skcipher.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
--- a/crypto/algif_skcipher.c
+++ b/crypto/algif_skcipher.c
@@ -536,7 +536,7 @@ static int skcipher_recvmsg_async(struct
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(
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;
Patches currently in stable-queue which might be from herbert@xxxxxxxxxxxxxxxxxxx are
queue-4.4/crypto-af_alg-disallow-bind-setkey-...-after-accept-2.patch
queue-4.4/crypto-crc32c-fix-crc32c-soft-dependency.patch
queue-4.4/crypto-af_alg-forbid-bind-2-when-nokey-child-sockets-are-present.patch
queue-4.4/crypto-algif_hash-fix-race-condition-in-hash_check_key.patch
queue-4.4/crypto-skcipher-add-crypto_skcipher_has_setkey.patch
queue-4.4/crypto-atmel-sha-remove-calls-of-clk_prepare-from-atomic-contexts.patch
queue-4.4/crypto-chacha20-ssse3-align-stack-pointer-to-64-bytes.patch
queue-4.4/crypto-algif_skcipher-add-key-check-exception-for-cipher_null.patch
queue-4.4/crypto-algif_skcipher-do-not-assume-that-req-is-unchanged.patch
queue-4.4/crypto-algif_hash-remove-custom-release-parent-function.patch
queue-4.4/crypto-algif_skcipher-load-tx-sg-list-after-waiting.patch
queue-4.4/crypto-algif_skcipher-require-setkey-before-accept-2.patch
queue-4.4/crypto-user-lock-crypto_alg_list-on-alg-dump.patch
queue-4.4/crypto-atmel-sha-fix-atmel_sha_remove.patch
queue-4.4/crypto-marvell-cesa-fix-test-in-mv_cesa_dev_dma_init.patch
queue-4.4/crypto-algif_skcipher-add-nokey-compatibility-path.patch
queue-4.4/crypto-shash-fix-has_key-setting.patch
queue-4.4/crypto-algif_skcipher-do-not-dereference-ctx-without-socket-lock.patch
queue-4.4/crypto-algif_skcipher-remove-custom-release-parent-function.patch
queue-4.4/crypto-af_alg-allow-af_af_alg_release_parent-to-be-called-on-nokey-path.patch
queue-4.4/crypto-hash-add-crypto_ahash_has_setkey.patch
queue-4.4/crypto-af_alg-add-nokey-compatibility-path.patch
queue-4.4/crypto-algif_skcipher-do-not-set-may_backlog-on-the-async-path.patch
queue-4.4/crypto-sun4i-ss-add-missing-statesize.patch
queue-4.4/crypto-algif_hash-require-setkey-before-accept-2.patch
queue-4.4/crypto-algif_skcipher-sendmsg-sg-marking-is-off-by-one.patch
queue-4.4/crypto-algif_skcipher-fix-race-condition-in-skcipher_check_key.patch
queue-4.4/crypto-algif_hash-wait-for-crypto_ahash_init-to-complete.patch
queue-4.4/crypto-caam-make-write-transactions-bufferable-on-ppc-platforms.patch
queue-4.4/crypto-af_alg-fix-socket-double-free-when-accept-fails.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html