diff options
| author | David Howells <dhowells@redhat.com> | 2009-09-02 09:14:00 +0100 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-09-02 21:29:11 +1000 |
| commit | 5d135440faf7db8d566de0c6fab36b16cf9cfc3b (patch) | |
| tree | d9c022e73ed51dfe5729fde9a97150cb64b68196 /security/keys/keyctl.c | |
| parent | f041ae2f99d49adc914153a34a2d0e14e4389d90 (diff) | |
| download | linux-3.10-5d135440faf7db8d566de0c6fab36b16cf9cfc3b.tar.gz linux-3.10-5d135440faf7db8d566de0c6fab36b16cf9cfc3b.tar.bz2 linux-3.10-5d135440faf7db8d566de0c6fab36b16cf9cfc3b.zip | |
KEYS: Add garbage collection for dead, revoked and expired keys. [try #6]
Add garbage collection for dead, revoked and expired keys. This involved
erasing all links to such keys from keyrings that point to them. At that
point, the key will be deleted in the normal manner.
Keyrings from which garbage collection occurs are shrunk and their quota
consumption reduced as appropriate.
Dead keys (for which the key type has been removed) will be garbage collected
immediately.
Revoked and expired keys will hang around for a number of seconds, as set in
/proc/sys/kernel/keys/gc_delay before being automatically removed. The default
is 5 minutes.
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'security/keys/keyctl.c')
| -rw-r--r-- | security/keys/keyctl.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/security/keys/keyctl.c b/security/keys/keyctl.c index 1160b644dac..736d7800f97 100644 --- a/security/keys/keyctl.c +++ b/security/keys/keyctl.c @@ -1115,6 +1115,7 @@ long keyctl_set_timeout(key_serial_t id, unsigned timeout) } key->expiry = expiry; + key_schedule_gc(key->expiry); up_write(&key->sem); key_put(key); |