[PATCH] eCryptfs: Delete a check before the function call "key_put"

[PATCH] eCryptfs: Delete a check before the function call "key_put"

[SF Markus Elfring]

From: Markus Elfring <elfring@users.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@users.sourceforge.net>
---
 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

Re: [PATCH] eCryptfs: Delete a check before the function call "key_put"

[Tyler Hicks]

[-- Attachment #1: Type: text/plain, Size: 1267 bytes --]

On 2015-06-26 18:25:09, SF Markus Elfring wrote:
> From: Markus Elfring <elfring@users.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@users.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
> 

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]