aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ecryptfs
diff options
context:
space:
mode:
authorMarkus Elfring <elfring@users.sourceforge.net>2015-06-26 12:18:54 -0400
committerTyler Hicks <tyhicks@canonical.com>2015-08-18 18:29:49 -0400
commit0dad87fcb732691bfd3183acccda6709e1e759ca (patch)
tree1fdf330c968fa00eb98301d8c7c390005866c7c9 /fs/ecryptfs
parent5556e7e6d30e8e9b5ee51b0e5edd526ee80e5e36 (diff)
eCryptfs: Delete a check before the function call "key_put"
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> Signed-off-by: Tyler Hicks <tyhicks@canonical.com>
Diffstat (limited to 'fs/ecryptfs')
-rw-r--r--fs/ecryptfs/crypto.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/ecryptfs/crypto.c b/fs/ecryptfs/crypto.c
index 97315f2f6816..80d6901493cf 100644
--- a/fs/ecryptfs/crypto.c
+++ b/fs/ecryptfs/crypto.c
@@ -258,8 +258,7 @@ void ecryptfs_destroy_mount_crypt_stat(
258 &mount_crypt_stat->global_auth_tok_list, 258 &mount_crypt_stat->global_auth_tok_list,
259 mount_crypt_stat_list) { 259 mount_crypt_stat_list) {
260 list_del(&auth_tok->mount_crypt_stat_list); 260 list_del(&auth_tok->mount_crypt_stat_list);
261 if (auth_tok->global_auth_tok_key 261 if (!(auth_tok->flags & ECRYPTFS_AUTH_TOK_INVALID))
262 && !(auth_tok->flags & ECRYPTFS_AUTH_TOK_INVALID))
263 key_put(auth_tok->global_auth_tok_key); 262 key_put(auth_tok->global_auth_tok_key);
264 kmem_cache_free(ecryptfs_global_auth_tok_cache, auth_tok); 263 kmem_cache_free(ecryptfs_global_auth_tok_cache, auth_tok);
265 } 264 }