projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' into for-next
[firefly-linux-kernel-4.4.55.git]
/
security
/
keys
/
process_keys.c
diff --git
a/security/keys/process_keys.c
b/security/keys/process_keys.c
index a58f712605d83105b6d32e1b966436a454331a90..86468f385fc8ef1ac0422afb117114f8d81b6ba4 100644
(file)
--- a/
security/keys/process_keys.c
+++ b/
security/keys/process_keys.c
@@
-358,8
+358,6
@@
key_ref_t search_my_process_keyrings(struct key_type *type,
switch (PTR_ERR(key_ref)) {
case -EAGAIN: /* no key */
- if (ret)
- break;
case -ENOKEY: /* negative key */
ret = key_ref;
break;