GIT: unionfs2-2.6.27.y: KEYS: Return more accurate error codes

[Erez Zadok]

commit e24ad12540142e1ae7e24da1072e977c5b17003b
Author: Dan Carpenter <error27 at gmail.com>
Date:   Mon May 17 14:42:35 2010 +0100

    KEYS: Return more accurate error codes
    
    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 at gmail.com>
    Signed-off-by: David Howells <dhowells at redhat.com>
    Signed-off-by: James Morris <jmorris at namei.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

diff --git a/security/keys/process_keys.c b/security/keys/process_keys.c
index 45b240a..b04a2bd 100644
--- a/security/keys/process_keys.c
+++ b/security/keys/process_keys.c
@@ -592,7 +592,7 @@ key_ref_t lookup_user_key(struct task_struct *context, key_serial_t id,
 
 			ret = install_thread_keyring(context);
 			if (ret < 0) {
-				key = ERR_PTR(ret);
+				key_ref = ERR_PTR(ret);
 				goto error;
 			}
 		}
@@ -609,7 +609,7 @@ key_ref_t lookup_user_key(struct task_struct *context, key_serial_t id,
 
 			ret = install_process_keyring(context);
 			if (ret < 0) {
-				key = ERR_PTR(ret);
+				key_ref = ERR_PTR(ret);
 				goto error;
 			}
 		}
@@ -665,7 +665,7 @@ key_ref_t lookup_user_key(struct task_struct *context, key_serial_t id,
 
 	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: