Fix install_process_keyring error handling
authorAndi Kleen <ak@linux.intel.com>
Thu, 28 Oct 2010 12:16:13 +0000 (13:16 +0100)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 28 Oct 2010 16:02:15 +0000 (09:02 -0700)
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

index f8e7251ae2c8f081ed25bf9920fa8aa33c8f287a..504bdd2452bd7ce1b995441662f16e02407f3fb3 100644 (file)
@@ -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);