summaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2013-09-24 11:35:14 +0200
committerDavid Howells <dhowells@redhat.com>2013-09-24 11:35:14 +0200
commita5b4bd2874d9032b42db8cc4880058576c561b06 (patch)
treea41cb03e506ebdd35d01c84f24bad0833ae3ea68 /security
parentKEYS: Skip key state checks when checking for possession (diff)
downloadlinux-a5b4bd2874d9032b42db8cc4880058576c561b06.tar.xz
linux-a5b4bd2874d9032b42db8cc4880058576c561b06.zip
KEYS: Use bool in make_key_ref() and is_key_possessed()
Make make_key_ref() take a bool possession parameter and make is_key_possessed() return a bool. Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'security')
-rw-r--r--security/keys/keyring.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/security/keys/keyring.c b/security/keys/keyring.c
index 6ece7f2e5707..f78406372ebe 100644
--- a/security/keys/keyring.c
+++ b/security/keys/keyring.c
@@ -329,9 +329,10 @@ key_ref_t keyring_search_aux(key_ref_t keyring_ref,
struct keyring_list *keylist;
struct timespec now;
- unsigned long possessed, kflags;
+ unsigned long kflags;
struct key *keyring, *key;
key_ref_t key_ref;
+ bool possessed;
long err;
int sp, nkeys, kix;
@@ -542,8 +543,8 @@ key_ref_t __keyring_search_one(key_ref_t keyring_ref,
key_perm_t perm)
{
struct keyring_list *klist;
- unsigned long possessed;
struct key *keyring, *key;
+ bool possessed;
int nkeys, loop;
keyring = key_ref_to_ptr(keyring_ref);