commit 27d6379894be4a81984da4d48002196a83939ca9
author Andi Kleen <ak@linux.intel.com> Thu Oct 28 13:16:13 2010 +0100
committer Linus Torvalds <torvalds@linux-foundation.org> Thu Oct 28 09:02:15 2010 -0700
tree 1d5a7338b0fc66ba4c0b799eb60df44b8f0fc08a
parent 765aaafe38050790301e89745b991dbdf3dded4c

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>

security/keys/process_keys.c

diff --git a/security/keys/process_keys.c b/security/keys/process_keys.c
index f8e7251..504bdd2 100644
--- a/security/keys/process_keys.c
+++ b/security/keys/process_keys.c
@@ -207,7 +207,7 @@
 	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);