diff options
| author | Roel Kluin <roel.kluin@gmail.com> | 2009-12-16 00:05:12 +0100 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-12-16 23:23:48 +0100 |
| commit | fa1cc7b5a5c4171dfdcac855428295340ccf87ec (patch) | |
| tree | eccd00dd480c980a45159e3964038cee255ff9f8 | |
| parent | Merge branch 'hwpoison' of git://git.kernel.org/pub/scm/linux/kernel/git/ak/l... (diff) | |
| download | linux-fa1cc7b5a5c4171dfdcac855428295340ccf87ec.tar.xz linux-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>
| -rw-r--r-- | security/keys/keyctl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/keys/keyctl.c b/security/keys/keyctl.c index 06ec722897be..5f830bc6f287 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); |