diff options
| author | James Morris <jmorris@namei.org> | 2016-01-10 21:52:17 +1100 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2016-01-10 21:52:17 +1100 |
| commit | 607259e17b37017e9ec0249a8b0a7d8b76b572aa (patch) | |
| tree | a8772ad30dd74afef995e558e723176e54369608 /security/keys | |
| parent | aa98b942cbf305cf2abe5dc3aff11f579c7d7fdc (diff) | |
| parent | 1d6d167c2efcfe9539d9cffb1a1be9c92e39c2c0 (diff) | |
| download | linux-607259e17b37017e9ec0249a8b0a7d8b76b572aa.tar.gz linux-607259e17b37017e9ec0249a8b0a7d8b76b572aa.tar.bz2 linux-607259e17b37017e9ec0249a8b0a7d8b76b572aa.zip | |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity into ra-next
Diffstat (limited to 'security/keys')
| -rw-r--r-- | security/keys/key.c | 3 | ||||
| -rw-r--r-- | security/keys/keyctl.c | 17 |
2 files changed, 8 insertions, 12 deletions
diff --git a/security/keys/key.c b/security/keys/key.c index 09ef276c4bdc..07a87311055c 100644 --- a/security/keys/key.c +++ b/security/keys/key.c @@ -430,8 +430,7 @@ static int __key_instantiate_and_link(struct key *key, /* and link it into the destination keyring */ if (keyring) { - if (test_bit(KEY_FLAG_KEEP, &keyring->flags)) - set_bit(KEY_FLAG_KEEP, &key->flags); + set_bit(KEY_FLAG_KEEP, &key->flags); __key_link(key, _edit); } diff --git a/security/keys/keyctl.c b/security/keys/keyctl.c index e83ec6b9eb9d..8f9f323f372b 100644 --- a/security/keys/keyctl.c +++ b/security/keys/keyctl.c @@ -381,12 +381,11 @@ long keyctl_revoke_key(key_serial_t id) } key = key_ref_to_ptr(key_ref); + ret = 0; if (test_bit(KEY_FLAG_KEEP, &key->flags)) - return -EPERM; - else { + ret = -EPERM; + else key_revoke(key); - ret = 0; - } key_ref_put(key_ref); error: @@ -432,12 +431,11 @@ long keyctl_invalidate_key(key_serial_t id) invalidate: key = key_ref_to_ptr(key_ref); + ret = 0; if (test_bit(KEY_FLAG_KEEP, &key->flags)) ret = -EPERM; - else { + else key_invalidate(key); - ret = 0; - } error_put: key_ref_put(key_ref); error: @@ -1352,12 +1350,11 @@ long keyctl_set_timeout(key_serial_t id, unsigned timeout) okay: key = key_ref_to_ptr(key_ref); + ret = 0; if (test_bit(KEY_FLAG_KEEP, &key->flags)) ret = -EPERM; - else { + else key_set_timeout(key, timeout); - ret = 0; - } key_put(key); error: |