This is a note to let you know that I've just added the patch titled crypto: algif_hash - Remove custom release parent function to the 4.3-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_hash-remove-custom-release-parent-function.patch and it can be found in the queue-4.3 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From f1d84af1835846a5a2b827382c5848faf2bb0e75 Mon Sep 17 00:00:00 2001 From: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx> Date: Wed, 13 Jan 2016 15:00:36 +0800 Subject: crypto: algif_hash - Remove custom release parent function From: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx> commit f1d84af1835846a5a2b827382c5848faf2bb0e75 upstream. This patch removes the custom release parent function as the generic af_alg_release_parent now works for nokey sockets too. Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- crypto/algif_hash.c | 43 +++---------------------------------------- 1 file changed, 3 insertions(+), 40 deletions(-) --- a/crypto/algif_hash.c +++ b/crypto/algif_hash.c @@ -384,7 +384,7 @@ static int hash_setkey(void *private, co return err; } -static void hash_sock_destruct_common(struct sock *sk) +static void hash_sock_destruct(struct sock *sk) { struct alg_sock *ask = alg_sk(sk); struct hash_ctx *ctx = ask->private; @@ -392,33 +392,10 @@ static void hash_sock_destruct_common(st sock_kzfree_s(sk, ctx->result, crypto_ahash_digestsize(crypto_ahash_reqtfm(&ctx->req))); sock_kfree_s(sk, ctx, ctx->len); -} - -static void hash_sock_destruct(struct sock *sk) -{ - hash_sock_destruct_common(sk); - af_alg_release_parent(sk); -} - -static void hash_release_parent_nokey(struct sock *sk) -{ - struct alg_sock *ask = alg_sk(sk); - - if (!ask->refcnt) { - sock_put(ask->parent); - return; - } - af_alg_release_parent(sk); } -static void hash_sock_destruct_nokey(struct sock *sk) -{ - hash_sock_destruct_common(sk); - hash_release_parent_nokey(sk); -} - -static int hash_accept_parent_common(void *private, struct sock *sk) +static int hash_accept_parent_nokey(void *private, struct sock *sk) { struct hash_ctx *ctx; struct alg_sock *ask = alg_sk(sk); @@ -461,21 +438,7 @@ static int hash_accept_parent(void *priv if (!tfm->has_key && crypto_ahash_has_setkey(tfm->hash)) return -ENOKEY; - return hash_accept_parent_common(private, sk); -} - -static int hash_accept_parent_nokey(void *private, struct sock *sk) -{ - int err; - - err = hash_accept_parent_common(private, sk); - if (err) - goto out; - - sk->sk_destruct = hash_sock_destruct_nokey; - -out: - return err; + return hash_accept_parent_nokey(private, sk); } static const struct af_alg_type algif_type_hash = { Patches currently in stable-queue which might be from herbert@xxxxxxxxxxxxxxxxxxx are queue-4.3/crypto-fix-test-vector-for-rsa.patch queue-4.3/crypto-algif_skcipher-use-new-skcipher-interface.patch queue-4.3/crypto-af_alg-disallow-bind-setkey-...-after-accept-2.patch queue-4.3/crypto-crc32c-fix-crc32c-soft-dependency.patch queue-4.3/crypto-af_alg-forbid-bind-2-when-nokey-child-sockets-are-present.patch queue-4.3/crypto-crc32c-pclmul-use-.rodata-instead-of-.rotata.patch queue-4.3/crypto-caam-fix-non-block-aligned-hash-calculation.patch queue-4.3/crypto-nx-fix-timing-leak-in-gcm-and-ccm-decryption.patch queue-4.3/crypto-skcipher-copy-iv-from-desc-even-for-0-len-walks.patch queue-4.3/crypto-algif_hash-fix-race-condition-in-hash_check_key.patch queue-4.3/crypto-skcipher-add-crypto_skcipher_has_setkey.patch queue-4.3/crypto-chacha20-ssse3-align-stack-pointer-to-64-bytes.patch queue-4.3/crypto-algif_skcipher-add-key-check-exception-for-cipher_null.patch queue-4.3/crypto-algif_hash-remove-custom-release-parent-function.patch queue-4.3/crypto-algif_skcipher-load-tx-sg-list-after-waiting.patch queue-4.3/crypto-algif_skcipher-require-setkey-before-accept-2.patch queue-4.3/crypto-algif_skcipher-add-nokey-compatibility-path.patch queue-4.3/crypto-shash-fix-has_key-setting.patch queue-4.3/crypto-algif_skcipher-remove-custom-release-parent-function.patch queue-4.3/crypto-af_alg-allow-af_af_alg_release_parent-to-be-called-on-nokey-path.patch queue-4.3/crypto-hash-add-crypto_ahash_has_setkey.patch queue-4.3/crypto-af_alg-add-nokey-compatibility-path.patch queue-4.3/crypto-sun4i-ss-add-missing-statesize.patch queue-4.3/crypto-algif_hash-require-setkey-before-accept-2.patch queue-4.3/crypto-algif_skcipher-sendmsg-sg-marking-is-off-by-one.patch queue-4.3/crypto-qat-don-t-use-userspace-pointer.patch queue-4.3/crypto-talitos-fix-timing-leak-in-esp-icv-verification.patch queue-4.3/crypto-algif_hash-only-export-and-import-on-sockets-with-data.patch queue-4.3/crypto-algif_skcipher-fix-race-condition-in-skcipher_check_key.patch queue-4.3/crypto-caam-make-write-transactions-bufferable-on-ppc-platforms.patch queue-4.3/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