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: v3.16.35~461
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c8f7691fa11023ada207422138c0808820d181d3;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>
[bwh: Backported to 3.2: use crypto_ablkcipher_has_setkey()]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
---

diff --git a/crypto/algif_skcipher.c b/crypto/algif_skcipher.c
index f0037c0c36b75..584d70f7f8241 100644
--- a/crypto/algif_skcipher.c
+++ b/crypto/algif_skcipher.c
@@ -760,7 +760,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_ablkcipher_has_setkey(tfm->skcipher))
 		return -ENOKEY;
 
 	return skcipher_accept_parent_common(private, sk);