diff options
| author |   Markus Elfring <elfring@users.sourceforge.net> | 2017-08-19 17:51:53 +0200 |
|---|---|---|
| committer |   Tyler Hicks <tyhicks@canonical.com> | 2017-11-06 18:23:40 +0000 |
| commit | a463ce5bbd99fef6e1012cebe7b6764794ec07d8 (patch) | |
| tree | 28485a3ce1509f824bbf05f295ffc8a3d697ac1e /fs/ecryptfs/keystore.c | |
| parent | ecryptfs: Delete 21 error messages for a failed memory allocation (diff) | |
| download | linux-dev-a463ce5bbd99fef6e1012cebe7b6764794ec07d8.tar.xz linux-dev-a463ce5bbd99fef6e1012cebe7b6764794ec07d8.zip | |
ecryptfs: Return an error code only as a constant in ecryptfs_add_global_auth_tok()
* Return an error code without storing it in an intermediate variable.
* Delete the jump target "out" and the local variable "rc"
which became unnecessary with this refactoring.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Signed-off-by: Tyler Hicks <tyhicks@canonical.com>
Diffstat (limited to 'fs/ecryptfs/keystore.c')
| -rw-r--r-- | fs/ecryptfs/keystore.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/fs/ecryptfs/keystore.c b/fs/ecryptfs/keystore.c index 540952dacb1a..492d6a2823db 100644 --- a/fs/ecryptfs/keystore.c +++ b/fs/ecryptfs/keystore.c @@ -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; } |