BACKPORT: 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)
committerRafal Krypa <r.krypa@samsung.com>
Thu, 30 Jun 2016 12:57:32 +0000 (14:57 +0200)
commita79a0ac994627dfb5c232f70a7d026353c43de68
treef295a351dda08b325aba68e9c6680cb9f492058f
parent06cbf6c2c9932343839d64ba91e515f61e561cc5
BACKPORT: 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>
(cherry-picked from upstream f5895943d91b41b0368830cdb6eaffb8eda0f4c8)
12 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/proc.c
security/security.c
security/selinux/hooks.c
security/smack/smack_lsm.c