diff options
| author | Andi Kleen <ak@linux.intel.com> | 2010-10-28 16:16:13 +0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2014-02-11 01:11:33 +0400 |
| commit | 14424d71693c91f25d74ac09793d9f4aae43c104 (patch) | |
| tree | 9f7de15a969dbb1a723d52d78f51e0d832275c88 | |
| parent | 000e338c2808b8f416df36f43074a46eebdffff0 (diff) | |
| download | linux-14424d71693c91f25d74ac09793d9f4aae43c104.tar.xz | |
Fix install_process_keyring error handling
commit 27d6379894be4a81984da4d48002196a83939ca9 upstream.
Fix an incorrect error check that returns 1 for error instead of the
expected error code.
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | security/keys/process_keys.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/keys/process_keys.c b/security/keys/process_keys.c index 71c10cec3c18..058d4fdf5de1 100644 --- 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); |