From: Roel Kluin <roel.kluin@gmail.com>
Date: Tue, 15 Dec 2009 23:05:12 +0000 (-0800)
Subject: keys: PTR_ERR return of wrong pointer in keyctl_get_security()
X-Git-Tag: upstream/snapshot3+hdmi~16063^2~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fa1cc7b5a5c4171dfdcac855428295340ccf87ec;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

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>
---

diff --git a/security/keys/keyctl.c b/security/keys/keyctl.c
index 06ec722..5f830bc 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);