| From | Paul Gortmaker <> | Subject | [v2.6.34-stable 191/213] Fix install_process_keyring error handling | Date | Wed, 5 Feb 2014 15:02:26 -0500 |
| |
From: Andi Kleen <ak@linux.intel.com>
------------------- This is a commit scheduled for the next v2.6.34 longterm release. http://git.kernel.org/?p=linux/kernel/git/paulg/longterm-queue-2.6.34.git If you see a problem with using this for longterm, please comment. -------------------
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
|