| From 01a7d049be09c3344295f3dc237e619e5c2e1ced Mon Sep 17 00:00:00 2001 |
| From: Andi Kleen <ak@linux.intel.com> |
| Date: Thu, 28 Oct 2010 13:16:13 +0100 |
| Subject: [PATCH] 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> |
| --- |
| security/keys/process_keys.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| 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); |
| -- |
| 1.8.5.2 |
| |
