summaryrefslogtreecommitdiff
path: root/security/keys/keyctl.c
diff options
context:
space:
mode:
authorRoel Kluin <roel.kluin@gmail.com>2009-12-15 15:05:12 -0800
committerJames Morris <jmorris@namei.org>2009-12-17 09:23:48 +1100
commitfa1cc7b5a5c4171dfdcac855428295340ccf87ec (patch)
treeeccd00dd480c980a45159e3964038cee255ff9f8 /security/keys/keyctl.c
parentd4220f987cf473c65a342ca69e3eb13dea919a49 (diff)
downloadlinux-3.10-fa1cc7b5a5c4171dfdcac855428295340ccf87ec.tar.gz
linux-3.10-fa1cc7b5a5c4171dfdcac855428295340ccf87ec.tar.bz2
linux-3.10-fa1cc7b5a5c4171dfdcac855428295340ccf87ec.zip
keys: PTR_ERR return of wrong pointer in keyctl_get_security()
Return the PTR_ERR of the correct pointer. Signed-off-by: Roel Kluin <roel.kluin@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Acked-by: David Howells <dhowells@redhat.com> Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'security/keys/keyctl.c')
-rw-r--r--security/keys/keyctl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/security/keys/keyctl.c b/security/keys/keyctl.c
index 06ec722897b..5f830bc6f28 100644
--- a/security/keys/keyctl.c
+++ b/security/keys/keyctl.c
@@ -1194,7 +1194,7 @@ long keyctl_get_security(key_serial_t keyid,
* have the authorisation token handy */
instkey = key_get_instantiation_authkey(keyid);
if (IS_ERR(instkey))
- return PTR_ERR(key_ref);
+ return PTR_ERR(instkey);
key_put(instkey);
key_ref = lookup_user_key(keyid, KEY_LOOKUP_PARTIAL, 0);