From fd86aca056ab1b766288fee854dab05af43d22b7 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Mon, 17 May 2010 14:42:35 +0100 Subject: [PATCH] --- yaml --- r: 192454 b: refs/heads/master c: 4d09ec0f705cf88a12add029c058b53f288cfaa2 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/security/keys/process_keys.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index bddceb3dddcf..c87d5ab7a089 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c80901f2755c582e3096e6708028a8daca59e6e2 +refs/heads/master: 4d09ec0f705cf88a12add029c058b53f288cfaa2 diff --git a/trunk/security/keys/process_keys.c b/trunk/security/keys/process_keys.c index 06c2ccf26ed3..20a38fed61b1 100644 --- a/trunk/security/keys/process_keys.c +++ b/trunk/security/keys/process_keys.c @@ -508,7 +508,7 @@ key_ref_t lookup_user_key(key_serial_t id, unsigned long lflags, ret = install_thread_keyring(); if (ret < 0) { - key = ERR_PTR(ret); + key_ref = ERR_PTR(ret); goto error; } goto reget_creds; @@ -526,7 +526,7 @@ key_ref_t lookup_user_key(key_serial_t id, unsigned long lflags, ret = install_process_keyring(); if (ret < 0) { - key = ERR_PTR(ret); + key_ref = ERR_PTR(ret); goto error; } goto reget_creds; @@ -585,7 +585,7 @@ key_ref_t lookup_user_key(key_serial_t id, unsigned long lflags, case KEY_SPEC_GROUP_KEYRING: /* group keyrings are not yet supported */ - key = ERR_PTR(-EINVAL); + key_ref = ERR_PTR(-EINVAL); goto error; case KEY_SPEC_REQKEY_AUTH_KEY: