projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-2637/i2c-all' of git://git.fluff.org/bjdooks/linux
[cascardo/linux.git]
/
security
/
keys
/
process_keys.c
diff --git
a/security/keys/process_keys.c
b/security/keys/process_keys.c
index
f8e7251
..
504bdd2
100644
(file)
--- a/
security/keys/process_keys.c
+++ b/
security/keys/process_keys.c
@@
-207,7
+207,7
@@
static int install_process_keyring(void)
ret = install_process_keyring_to_cred(new);
if (ret < 0) {
abort_creds(new);
- return ret != -EEXIST ?: 0;
+ return ret != -EEXIST ?
ret
: 0;
}
return commit_creds(new);