FAILED: patch "[PATCH] crypto: algif_skcipher - Add key check exception for" failed to apply to 3.10-stable tree

The patch below does not apply to the 3.10-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From: Herbert Xu <[email protected]>
Date: Mon, 11 Jan 2016 21:29:41 +0800
Subject: [PATCH] crypto: algif_skcipher - Add key check exception for
cipher_null

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

index 110bab499e43..4a5bdb69fd49 100644
@@ -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);