From: Herbert Xu 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.2.77~13 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=a59afee0ac4a3e6a249ebcb43da65ad99c513e33 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 [bwh: Backported to 3.2: use crypto_ablkcipher_has_setkey()] Signed-off-by: Ben Hutchings --- diff --git a/crypto/algif_skcipher.c b/crypto/algif_skcipher.c index 600d7bfd0930..f7f6f9e01169 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);