Commit 4d09ec0f authored by Dan Carpenter's avatar Dan Carpenter Committed by James Morris

KEYS: Return more accurate error codes

We were using the wrong variable here so the error codes weren't being returned
properly.  The original code returns -ENOKEY.
Signed-off-by: default avatarDan Carpenter <error27@gmail.com>
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarJames Morris <jmorris@namei.org>
parent c80901f2
...@@ -508,7 +508,7 @@ key_ref_t lookup_user_key(key_serial_t id, unsigned long lflags, ...@@ -508,7 +508,7 @@ key_ref_t lookup_user_key(key_serial_t id, unsigned long lflags,
ret = install_thread_keyring(); ret = install_thread_keyring();
if (ret < 0) { if (ret < 0) {
key = ERR_PTR(ret); key_ref = ERR_PTR(ret);
goto error; goto error;
} }
goto reget_creds; goto reget_creds;
...@@ -526,7 +526,7 @@ key_ref_t lookup_user_key(key_serial_t id, unsigned long lflags, ...@@ -526,7 +526,7 @@ key_ref_t lookup_user_key(key_serial_t id, unsigned long lflags,
ret = install_process_keyring(); ret = install_process_keyring();
if (ret < 0) { if (ret < 0) {
key = ERR_PTR(ret); key_ref = ERR_PTR(ret);
goto error; goto error;
} }
goto reget_creds; goto reget_creds;
...@@ -585,7 +585,7 @@ key_ref_t lookup_user_key(key_serial_t id, unsigned long lflags, ...@@ -585,7 +585,7 @@ key_ref_t lookup_user_key(key_serial_t id, unsigned long lflags,
case KEY_SPEC_GROUP_KEYRING: case KEY_SPEC_GROUP_KEYRING:
/* group keyrings are not yet supported */ /* group keyrings are not yet supported */
key = ERR_PTR(-EINVAL); key_ref = ERR_PTR(-EINVAL);
goto error; goto error;
case KEY_SPEC_REQKEY_AUTH_KEY: case KEY_SPEC_REQKEY_AUTH_KEY:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment