From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Mon, 11 Jan 2016 13:29:41 +0000 (+0800)
Subject: crypto: algif_skcipher - Add key check exception for cipher_null
X-Git-Tag: v4.3.6~38
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=38c3e0d5568453c519ae53e1a67cc7e3501274d7;p=thirdparty%2Fkernel%2Fstable.git

crypto: algif_skcipher - Add key check exception for cipher_null

commit 6e8d8ecf438792ecf7a3207488fb4eebc4edb040 upstream.

This patch adds an exception to the key check so that cipher_null
users may continue to use algif_skcipher without setting a key.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/crypto/algif_skcipher.c b/crypto/algif_skcipher.c
index 3d5108fdb89c9..e71fbdb344e29 100644
--- a/crypto/algif_skcipher.c
+++ b/crypto/algif_skcipher.c
@@ -978,7 +978,7 @@ static int skcipher_accept_parent(void *private, struct sock *sk)
 {
 	struct skcipher_tfm *tfm = private;
 
-	if (!tfm->has_key)
+	if (!tfm->has_key && crypto_skcipher_has_setkey(tfm->skcipher))
 		return -ENOKEY;
 
 	return skcipher_accept_parent_common(private, sk);