Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit fa1cc7b5a5c4171dfdcac855428295340ccf87ec

Authored by Roel Kluin
Committed by James Morris
1 parent d4220f987c
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff

security/keys/keyctl.c
Diff comments   View file @ fa1cc7b
... ... @@ -1194,7 +1194,7 @@
1194 1194 * have the authorisation token handy */
1195 1195 instkey = key_get_instantiation_authkey(keyid);
1196 1196 if (IS_ERR(instkey))
1197   - return PTR_ERR(key_ref);
  1197 + return PTR_ERR(instkey);
1198 1198 key_put(instkey);
1199 1199  
1200 1200 key_ref = lookup_user_key(keyid, KEY_LOOKUP_PARTIAL, 0);