From: Dan Carpenter Date: Mon, 17 May 2010 13:42:35 +0000 (+0100) Subject: KEYS: Return more accurate error codes X-Git-Tag: v2.6.27.48~3 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e24ad12540142e1ae7e24da1072e977c5b17003b;p=thirdparty%2Fkernel%2Fstable.git 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 Signed-off-by: David Howells Signed-off-by: James Morris Signed-off-by: Greg Kroah-Hartman --- diff --git a/security/keys/process_keys.c b/security/keys/process_keys.c index 45b240af6dbe2..b04a2bd0856de 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: