summaryrefslogtreecommitdiffstats
path: root/security/capability.c
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2014-03-14 17:44:49 +0000
committerDavid Howells <dhowells@redhat.com>2014-03-14 17:44:49 +0000
commitf5895943d91b41b0368830cdb6eaffb8eda0f4c8 (patch)
tree7f2306521dae27b9beb0be25942d27ee6d9a328a /security/capability.c
parentc60f7d5a8e7c639de5d9dfe07e1e91d302d506e4 (diff)
downloadop-kernel-dev-f5895943d91b41b0368830cdb6eaffb8eda0f4c8.zip
op-kernel-dev-f5895943d91b41b0368830cdb6eaffb8eda0f4c8.tar.gz
KEYS: Move the flags representing required permission to linux/key.h
Move the flags representing required permission to linux/key.h as the perm parameter of security_key_permission() is in terms of them - and not the permissions mask flags used in key->perm. Whilst we're at it: (1) Rename them to be KEY_NEED_xxx rather than KEY_xxx to avoid collisions with symbols in uapi/linux/input.h. (2) Don't use key_perm_t for a mask of required permissions, but rather limit it to the permissions mask attached to the key and arguments related directly to that. Signed-off-by: David Howells <dhowells@redhat.com> Tested-by: Dmitry Kasatkin <d.kasatkin@samsung.com>
Diffstat (limited to 'security/capability.c')
-rw-r--r--security/capability.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/security/capability.c b/security/capability.c
index 8b4f24a..c1426b9 100644
--- a/security/capability.c
+++ b/security/capability.c
@@ -878,7 +878,7 @@ static void cap_key_free(struct key *key)
}
static int cap_key_permission(key_ref_t key_ref, const struct cred *cred,
- key_perm_t perm)
+ unsigned perm)
{
return 0;
}
OpenPOWER on IntegriCloud