aboutsummaryrefslogtreecommitdiffstats
path: root/security/keys
diff options
context:
space:
mode:
Diffstat (limited to 'security/keys')
-rw-r--r--security/keys/key.c3
-rw-r--r--security/keys/keyring.c8
2 files changed, 5 insertions, 6 deletions
diff --git a/security/keys/key.c b/security/keys/key.c
index ccde17aff616..01bcfecb7eae 100644
--- a/security/keys/key.c
+++ b/security/keys/key.c
@@ -115,8 +115,7 @@ struct key_user *key_user_lookup(uid_t uid)
115 found: 115 found:
116 atomic_inc(&user->usage); 116 atomic_inc(&user->usage);
117 spin_unlock(&key_user_lock); 117 spin_unlock(&key_user_lock);
118 if (candidate) 118 kfree(candidate);
119 kfree(candidate);
120 out: 119 out:
121 return user; 120 return user;
122 121
diff --git a/security/keys/keyring.c b/security/keys/keyring.c
index e1cc4dd79012..c7a0ab1cfda3 100644
--- a/security/keys/keyring.c
+++ b/security/keys/keyring.c
@@ -434,8 +434,8 @@ ascend:
434 if (sp >= KEYRING_SEARCH_MAX_DEPTH) 434 if (sp >= KEYRING_SEARCH_MAX_DEPTH)
435 continue; 435 continue;
436 436
437 if (!key_task_permission(make_key_ref(key, possessed), 437 if (key_task_permission(make_key_ref(key, possessed),
438 context, KEY_SEARCH) < 0) 438 context, KEY_SEARCH) < 0)
439 continue; 439 continue;
440 440
441 /* stack the current position */ 441 /* stack the current position */
@@ -621,8 +621,8 @@ struct key *find_keyring_by_name(const char *name, key_serial_t bound)
621 if (strcmp(keyring->description, name) != 0) 621 if (strcmp(keyring->description, name) != 0)
622 continue; 622 continue;
623 623
624 if (!key_permission(make_key_ref(keyring, 0), 624 if (key_permission(make_key_ref(keyring, 0),
625 KEY_SEARCH) < 0) 625 KEY_SEARCH) < 0)
626 continue; 626 continue;
627 627
628 /* found a potential candidate, but we still need to 628 /* found a potential candidate, but we still need to