KEYS: Move the flags representing required permission to linux/key.h
authorDavid Howells <dhowells@redhat.com>
Fri, 14 Mar 2014 17:44:49 +0000 (17:44 +0000)
committerDamian Hobson-Garcia <dhobsong@igel.co.jp>
Thu, 11 Dec 2014 07:53:23 +0000 (16:53 +0900)
commit4f0a43942c027940c4bc7080e4250ed6cdbc2b95
treed236ca964f660e0a1855a167492990ce75dd278e
parentfa71788e44fd122e139d8e0ca50d28b704aecb11
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.

Change-Id: Id9de84f93e5dd668a3b8ba00fc2440c6d6c6f988
Signed-off-by: David Howells <dhowells@redhat.com>
Tested-by: Dmitry Kasatkin <d.kasatkin@samsung.com>
Signed-off-by: Rafal Krypa <r.krypa@samsung.com>
Origin: upstream
(cherry picked from commit 5ee6bcc6014f3d271be0db115e92144173c56726)

Signed-off-by: Damian Hobson-Garcia <dhobsong@igel.co.jp>
13 files changed:
include/linux/key.h
include/linux/security.h
security/capability.c
security/keys/internal.h
security/keys/key.c
security/keys/keyctl.c
security/keys/keyring.c
security/keys/permission.c
security/keys/persistent.c
security/keys/proc.c
security/security.c
security/selinux/hooks.c
security/smack/smack_lsm.c