Patch "crypto: shash - Fix has_key setting" has been added to the 4.4-stable tree

Patch "crypto: shash - Fix has_key setting" has been added to the 4.4-stable tree

[gregkh]

This is a note to let you know that I've just added the patch titled

    crypto: shash - Fix has_key setting

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-shash-fix-has_key-setting.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@vger.kernel.org> know about it.


>From 00420a65fa2beb3206090ead86942484df2275f3 Mon Sep 17 00:00:00 2001
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Wed, 27 Jan 2016 00:16:37 +0800
Subject: crypto: shash - Fix has_key setting

From: Herbert Xu <herbert@gondor.apana.org.au>

commit 00420a65fa2beb3206090ead86942484df2275f3 upstream.

The has_key logic is wrong for shash algorithms as they always
have a setkey function.  So we should instead be testing against
shash_no_setkey.

Fixes: a5596d633278 ("crypto: hash - Add crypto_ahash_has_setkey")
Reported-by: Stephan Mueller <smueller@chronox.de>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Tested-by: Stephan Mueller <smueller@chronox.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 crypto/shash.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

--- a/crypto/shash.c
+++ b/crypto/shash.c
@@ -354,11 +354,10 @@ int crypto_init_shash_ops_async(struct c
 	crt->final = shash_async_final;
 	crt->finup = shash_async_finup;
 	crt->digest = shash_async_digest;
+	crt->setkey = shash_async_setkey;
+
+	crt->has_setkey = alg->setkey != shash_no_setkey;
 
-	if (alg->setkey) {
-		crt->setkey = shash_async_setkey;
-		crt->has_setkey = true;
-	}
 	if (alg->export)
 		crt->export = shash_async_export;
 	if (alg->import)


Patches currently in stable-queue which might be from herbert@gondor.apana.org.au 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-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_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-algif_skcipher-add-nokey-compatibility-path.patch
queue-4.4/crypto-shash-fix-has_key-setting.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-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