aboutsummaryrefslogtreecommitdiffstats
path: root/security/smack
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2014-03-14 13:44:49 -0400
committerDavid Howells <dhowells@redhat.com>2014-03-14 13:44:49 -0400
commitf5895943d91b41b0368830cdb6eaffb8eda0f4c8 (patch)
tree7f2306521dae27b9beb0be25942d27ee6d9a328a /security/smack
parentc60f7d5a8e7c639de5d9dfe07e1e91d302d506e4 (diff)
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/smack')
-rw-r--r--security/smack/smack_lsm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
index 14f52be78c75..c47dd8ca019c 100644
--- a/security/smack/smack_lsm.c
+++ b/security/smack/smack_lsm.c
@@ -3506,7 +3506,7 @@ static void smack_key_free(struct key *key)
3506 * an error code otherwise 3506 * an error code otherwise
3507 */ 3507 */
3508static int smack_key_permission(key_ref_t key_ref, 3508static int smack_key_permission(key_ref_t key_ref,
3509 const struct cred *cred, key_perm_t perm) 3509 const struct cred *cred, unsigned perm)
3510{ 3510{
3511 struct key *keyp; 3511 struct key *keyp;
3512 struct smk_audit_info ad; 3512 struct smk_audit_info ad;