Commit fa1cc7b5 authored Dec 15, 2009 by Roel Kluin Committed by James Morris Dec 17, 2009

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>

parent d4220f98

security/keys/keyctl.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);