diff options
| author |   David Howells <dhowells@redhat.com> | 2009-09-02 09:13:55 +0100 |
|---|---|---|
| committer |   James Morris <jmorris@namei.org> | 2009-09-02 21:29:09 +1000 |
| commit | f041ae2f99d49adc914153a34a2d0e14e4389d90 (patch) | |
| tree | 02cf0a1e85920122e1059496942b979e5832ff1b | |
| parent | KEYS: Allow keyctl_revoke() on keys that have SETATTR but not WRITE perm [try #6] (diff) | |
| download | linux-dev-f041ae2f99d49adc914153a34a2d0e14e4389d90.tar.xz linux-dev-f041ae2f99d49adc914153a34a2d0e14e4389d90.zip | |
KEYS: Flag dead keys to induce EKEYREVOKED [try #6]
Set the KEY_FLAG_DEAD flag on keys for which the type has been removed. This
causes the key_permission() function to return EKEYREVOKED in response to
various commands. It does not, however, prevent unlinking or clearing of
keyrings from detaching the key.
Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Serge Hallyn <serue@us.ibm.com>
Signed-off-by: James Morris <jmorris@namei.org>
| -rw-r--r-- | security/keys/key.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/security/keys/key.c b/security/keys/key.c index 3762d5b1ce64..bd9d2670e9c4 100644 --- a/security/keys/key.c +++ b/security/keys/key.c @@ -956,8 +956,10 @@ void unregister_key_type(struct key_type *ktype) for (_n = rb_first(&key_serial_tree); _n; _n = rb_next(_n)) { key = rb_entry(_n, struct key, serial_node); - if (key->type == ktype) + if (key->type == ktype) { key->type = &key_type_dead; + set_bit(KEY_FLAG_DEAD, &key->flags); + } } spin_unlock(&key_serial_lock); |