linux-kernel - Re: [PATCH] eCryptfs: Delete a check before the function call "key

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20150806140928.GA5766@boyd>
Date:	Thu, 6 Aug 2015 09:09:28 -0500
From:	Tyler Hicks <tyhicks@...onical.com>
To:	SF Markus Elfring <elfring@...rs.sourceforge.net>
Cc:	ecryptfs@...r.kernel.org, LKML <linux-kernel@...r.kernel.org>,
	kernel-janitors@...r.kernel.org,
	Julia Lawall <julia.lawall@...6.fr>
Subject: Re: [PATCH] eCryptfs: Delete a check before the function call
 "key_put"

On 2015-06-26 18:25:09, SF Markus Elfring wrote:
> From: Markus Elfring <elfring@...rs.sourceforge.net>
> Date: Fri, 26 Jun 2015 18:18:54 +0200
> 
> The key_put() function tests whether its argument is NULL and then
> returns immediately. Thus the test around this call might not be needed.
> 
> This issue was detected by using the Coccinelle software.
> 
> Signed-off-by: Markus Elfring <elfring@...rs.sourceforge.net>

Thanks for the cleanup. I'll include it in an upcoming eCryptfs pull
request.

Tyler

> ---
>  fs/ecryptfs/crypto.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/fs/ecryptfs/crypto.c b/fs/ecryptfs/crypto.c
> index 97315f2..80d6901 100644
> --- a/fs/ecryptfs/crypto.c
> +++ b/fs/ecryptfs/crypto.c
> @@ -258,8 +258,7 @@ void ecryptfs_destroy_mount_crypt_stat(
>  				 &mount_crypt_stat->global_auth_tok_list,
>  				 mount_crypt_stat_list) {
>  		list_del(&auth_tok->mount_crypt_stat_list);
> -		if (auth_tok->global_auth_tok_key
> -		    && !(auth_tok->flags & ECRYPTFS_AUTH_TOK_INVALID))
> +		if (!(auth_tok->flags & ECRYPTFS_AUTH_TOK_INVALID))
>  			key_put(auth_tok->global_auth_tok_key);
>  		kmem_cache_free(ecryptfs_global_auth_tok_cache, auth_tok);
>  	}
> -- 
> 2.4.4
> 

Download attachment "signature.asc" of type "application/pgp-signature" (820 bytes)