Re: [PATCH] keys: Delete an unnecessary check before the function call "key_put"

Serge E. Hallyn
2015-06-25T13:12:54Z

On Wed, Jun 24, 2015 at 03:20:47PM +0200, SF Markus Elfring wrote:
> From: Markus Elfring <elfring@users.sourceforge.net>
> Date: Wed, 24 Jun 2015 15:16:35 +0200
>
> The key_put() function tests whether its argument is NULL and then
> returns immediately. Thus the test around the call is not needed.
>
> This issue was detected by using the Coccinelle software.
>
> Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>

Acked-by: Serge Hallyn <serge.hallyn@canonical.com>

> ---
> security/keys/process_keys.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/security/keys/process_keys.c b/security/keys/process_keys.c
> index bd536cb..225dd08 100644
> --- a/security/keys/process_keys.c
> +++ b/security/keys/process_keys.c
> @@ -242,9 +242,7 @@ int install_session_keyring_to_cred(struct cred *cred, struct key *keyring)
> old = cred->session_keyring;
> rcu_assign_pointer(cred->session_keyring, keyring);
>
> - if (old)
> - key_put(old);
> -
> + key_put(old);
> return 0;
> }
>
> --
> 2.4.4