Home » Mailing list archives » linux-kernel » 2010 » July » 1

[patch 161/164] KEYS: Return more accurate error codes

Previous thread: [patch 147/164] KVM: x86: Add callback to let modules decide over some supported cpuid bits by Greg KH on Thursday, July 1, 2010 - 10:35 am. (1 message)

Next thread: [patch 111/164] sata_nv: dont diddle with nIEN on mcp55 by Greg KH on Thursday, July 1, 2010 - 10:34 am. (1 message)
[view original message]
From: Greg KH
Subject: [patch 161/164] KEYS: Return more accurate error codes
Date: Thursday, July 1, 2010 - 10:35 am

2.6.33-stable review patch.  If anyone has any objections, please let me know.

------------------

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:


--


[ message continues ]
Previous thread: [patch 147/164] KVM: x86: Add callback to let modules decide over some supported cpuid bits by Greg KH on Thursday, July 1, 2010 - 10:35 am. (1 message)

Next thread: [patch 111/164] sata_nv: dont diddle with nIEN on mcp55 by Greg KH on Thursday, July 1, 2010 - 10:34 am. (1 message)