|
@@ -2526,14 +2526,12 @@ ecryptfs_add_global_auth_tok(struct ecryptfs_mount_crypt_stat *mount_crypt_stat,
|
|
|
char *sig, u32 global_auth_tok_flags)
|
|
|
{
|
|
|
struct ecryptfs_global_auth_tok *new_auth_tok;
|
|
|
- int rc = 0;
|
|
|
|
|
|
new_auth_tok = kmem_cache_zalloc(ecryptfs_global_auth_tok_cache,
|
|
|
GFP_KERNEL);
|
|
|
- if (!new_auth_tok) {
|
|
|
- rc = -ENOMEM;
|
|
|
- goto out;
|
|
|
- }
|
|
|
+ if (!new_auth_tok)
|
|
|
+ return -ENOMEM;
|
|
|
+
|
|
|
memcpy(new_auth_tok->sig, sig, ECRYPTFS_SIG_SIZE_HEX);
|
|
|
new_auth_tok->flags = global_auth_tok_flags;
|
|
|
new_auth_tok->sig[ECRYPTFS_SIG_SIZE_HEX] = '\0';
|
|
@@ -2541,7 +2539,6 @@ ecryptfs_add_global_auth_tok(struct ecryptfs_mount_crypt_stat *mount_crypt_stat,
|
|
|
list_add(&new_auth_tok->mount_crypt_stat_list,
|
|
|
&mount_crypt_stat->global_auth_tok_list);
|
|
|
mutex_unlock(&mount_crypt_stat->global_auth_tok_list_mutex);
|
|
|
-out:
|
|
|
- return rc;
|
|
|
+ return 0;
|
|
|
}
|
|
|
|