From: Dan Carpenter <dan.carpenter@oracle.com>
To: kernel-janitors@vger.kernel.org
Subject: [patch] KEYS: testing wrong bit for KEY_FLAG_REVOKED
Date: Mon, 05 Mar 2012 08:29:03 +0000 [thread overview]
Message-ID: <20120305082902.GA10894@elgon.mountain> (raw)
The test for "if (cred->request_key_auth->flags & KEY_FLAG_REVOKED) {"
should actually be "if (test_bit(KEY_FLAG_REVOKED, &req_key->flags)) {".
The current code actually checks for KEY_FLAG_DEAD.
The patch is really a one liner but I introduced a new variable so that
I don't go over the 80 character limit.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/security/keys/process_keys.c b/security/keys/process_keys.c
index 1068cb1..3185ec3 100644
--- a/security/keys/process_keys.c
+++ b/security/keys/process_keys.c
@@ -537,6 +537,7 @@ key_ref_t lookup_user_key(key_serial_t id, unsigned long lflags,
{
struct request_key_auth *rka;
const struct cred *cred;
+ struct key *req_key;
struct key *key;
key_ref_t key_ref, skey_ref;
int ret;
@@ -653,19 +654,20 @@ try_again:
break;
case KEY_SPEC_REQUESTOR_KEYRING:
- if (!cred->request_key_auth)
+ req_key = cred->request_key_auth;
+ if (!req_key)
goto error;
- down_read(&cred->request_key_auth->sem);
- if (cred->request_key_auth->flags & KEY_FLAG_REVOKED) {
+ down_read(&req_key->sem);
+ if (test_bit(KEY_FLAG_REVOKED, &req_key->flags)) {
key_ref = ERR_PTR(-EKEYREVOKED);
key = NULL;
} else {
- rka = cred->request_key_auth->payload.data;
+ rka = req_key->payload.data;
key = rka->dest_keyring;
atomic_inc(&key->usage);
}
- up_read(&cred->request_key_auth->sem);
+ up_read(&req_key->sem);
if (!key)
goto error;
key_ref = make_key_ref(key, 1);
next reply other threads:[~2012-03-05 8:29 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-05 8:29 Dan Carpenter [this message]
2012-03-06 11:22 ` [patch] KEYS: testing wrong bit for KEY_FLAG_REVOKED David Howells
-- strict thread matches above, loose matches on Subject: below --
2012-03-06 13:32 [PATCH] " David Howells
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120305082902.GA10894@elgon.mountain \
--to=dan.carpenter@oracle.com \
--cc=kernel-janitors@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.