diff options
| author | David Howells <dhowells@redhat.com> | 2019-09-03 23:34:27 +0100 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2019-09-03 23:34:27 +0100 |
| commit | 1f96e0f129eb2bea15a00c154eee8b85aa181d1a (patch) | |
| tree | b060a62d9b7565961b3cc87d147bfa7793e2d9c5 /security/smack/smack_lsm.c | |
| parent | 7a36e1f9f7c50b55bcaf45bc370cfe98ee1fd2fd (diff) | |
| parent | 9e913fad711d7384962a1a6c1fafdf3ff452907f (diff) | |
| download | linux-next-1f96e0f129eb2bea15a00c154eee8b85aa181d1a.tar.gz | |
Merge branch 'keys-acl' into keys-next
The notify_key() call that was in keyctl_setperm_key() is moved to
key_set_acl().
Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'security/smack/smack_lsm.c')
| -rw-r--r-- | security/smack/smack_lsm.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c index 1c2a908c6446..d957450a30ab 100644 --- a/security/smack/smack_lsm.c +++ b/security/smack/smack_lsm.c @@ -4284,7 +4284,8 @@ static int smack_key_permission(key_ref_t key_ref, #endif if (perm & (KEY_NEED_READ | KEY_NEED_SEARCH | KEY_NEED_VIEW)) request |= MAY_READ; - if (perm & (KEY_NEED_WRITE | KEY_NEED_LINK | KEY_NEED_SETATTR)) + if (perm & (KEY_NEED_WRITE | KEY_NEED_LINK | KEY_NEED_SETSEC | + KEY_NEED_INVAL | KEY_NEED_REVOKE | KEY_NEED_CLEAR)) request |= MAY_WRITE; rc = smk_access(tkp, keyp->security, request, &ad); rc = smk_bu_note("key access", tkp, keyp->security, request, rc); |