[PATCH 4.4 088/117] crypto: algif_skcipher - Add key check exception for cipher_null

[Greg Kroah-Hartman]

4.4-stable review patch.  If anyone has any objections, please let me know.

------------------

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

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 <herb...@gondor.apana.org.au>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>

---
 crypto/algif_skcipher.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/crypto/algif_skcipher.c
+++ b/crypto/algif_skcipher.c
@@ -978,7 +978,7 @@ static int skcipher_accept_parent(void *
 {
        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);