| From 4d09ec0f705cf88a12add029c058b53f288cfaa2 Mon Sep 17 00:00:00 2001 |
| From: Dan Carpenter <error27@gmail.com> |
| Date: Mon, 17 May 2010 14:42:35 +0100 |
| Subject: KEYS: Return more accurate error codes |
| |
| From: Dan Carpenter <error27@gmail.com> |
| |
| commit 4d09ec0f705cf88a12add029c058b53f288cfaa2 upstream. |
| |
| We were using the wrong variable here so the error codes weren't being returned |
| properly. The original code returns -ENOKEY. |
| |
| Signed-off-by: Dan Carpenter <error27@gmail.com> |
| Signed-off-by: David Howells <dhowells@redhat.com> |
| Signed-off-by: James Morris <jmorris@namei.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| security/keys/process_keys.c | 6 +++--- |
| 1 file changed, 3 insertions(+), 3 deletions(-) |
| |
| --- a/security/keys/process_keys.c |
| +++ b/security/keys/process_keys.c |
| @@ -509,7 +509,7 @@ try_again: |
| |
| ret = install_thread_keyring(); |
| if (ret < 0) { |
| - key = ERR_PTR(ret); |
| + key_ref = ERR_PTR(ret); |
| goto error; |
| } |
| goto reget_creds; |
| @@ -527,7 +527,7 @@ try_again: |
| |
| ret = install_process_keyring(); |
| if (ret < 0) { |
| - key = ERR_PTR(ret); |
| + key_ref = ERR_PTR(ret); |
| goto error; |
| } |
| goto reget_creds; |
| @@ -586,7 +586,7 @@ try_again: |
| |
| case KEY_SPEC_GROUP_KEYRING: |
| /* group keyrings are not yet supported */ |
| - key = ERR_PTR(-EINVAL); |
| + key_ref = ERR_PTR(-EINVAL); |
| goto error; |
| |
| case KEY_SPEC_REQKEY_AUTH_KEY: |
