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-Url: https://git.stricted.de/?a=commitdiff_plain;h=6e8d8ecf438792ecf7a3207488fb4eebc4edb040;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git 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. Cc: stable@vger.kernel.org Signed-off-by: Herbert Xu --- diff --git a/crypto/algif_skcipher.c b/crypto/algif_skcipher.c index 110bab499e43..4a5bdb69fd49 100644 --- 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);