Re: [PATCH 2/2] crypto: algif_skcipher - Add key check exception for cipher_null

From: Milan Broz
Date: Mon Jan 11 2016 - 09:59:49 EST


On 01/11/2016 02:29 PM, Herbert Xu wrote:
> 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@xxxxxxxxxxxxxxxxxxx>
>
> diff --git a/crypto/algif_skcipher.c b/crypto/algif_skcipher.c
> index 110bab4..4a5bdb6 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);

Reported-and-tested-by: Milan Broz <gmazyland@xxxxxxxxx>

Thanks,
Milan