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 bb0ee129a775e83ac3dd85d02ede3d879e1b1499..c3b5c91b22d9a9a492eb11623f35fa7fabc0661f 100644 (file)
--- 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);