diff options
author | Andi Kleen <ak@linux.intel.com> | 2010-10-28 08:16:13 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-28 12:02:15 -0400 |
commit | 27d6379894be4a81984da4d48002196a83939ca9 (patch) | |
tree | 1d5a7338b0fc66ba4c0b799eb60df44b8f0fc08a | |
parent | 765aaafe38050790301e89745b991dbdf3dded4c (diff) |
Fix install_process_keyring error handling
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>
-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 f8e7251ae2c8..504bdd2452bd 100644 --- a/security/keys/process_keys.c +++ b/security/keys/process_keys.c | |||
@@ -207,7 +207,7 @@ static int install_process_keyring(void) | |||
207 | ret = install_process_keyring_to_cred(new); | 207 | ret = install_process_keyring_to_cred(new); |
208 | if (ret < 0) { | 208 | if (ret < 0) { |
209 | abort_creds(new); | 209 | abort_creds(new); |
210 | return ret != -EEXIST ?: 0; | 210 | return ret != -EEXIST ? ret : 0; |
211 | } | 211 | } |
212 | 212 | ||
213 | return commit_creds(new); | 213 | return commit_creds(new); |