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 /include/linux/key.h | |
| parent | f041ae2f99d49adc914153a34a2d0e14e4389d90 (diff) | |
| download | linux-stable-5d135440faf7db8d566de0c6fab36b16cf9cfc3b.tar.gz linux-stable-5d135440faf7db8d566de0c6fab36b16cf9cfc3b.tar.bz2 linux-stable-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 'include/linux/key.h')
| -rw-r--r-- | include/linux/key.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/key.h b/include/linux/key.h index e544f466d69a..33e0165de100 100644 --- a/include/linux/key.h +++ b/include/linux/key.h @@ -129,7 +129,10 @@ struct key { struct rw_semaphore sem; /* change vs change sem */ struct key_user *user; /* owner of this key */ void *security; /* security data for this key */ - time_t expiry; /* time at which key expires (or 0) */ + union { + time_t expiry; /* time at which key expires (or 0) */ + time_t revoked_at; /* time at which key was revoked */ + }; uid_t uid; gid_t gid; key_perm_t perm; /* access permissions */ |