openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

KEYS: Have the garbage collector set its timer for live expired keys 

The key garbage collector sets a timer to start a new collection cycle at the
point the earliest key to expire should be considered garbage.  However, it
currently only does this if the key it is considering hasn't yet expired.

If the key being considering has expired, but hasn't yet reached the collection
time then it is ignored, and won't be collected until some other key provokes a
round of collection.

Make the garbage collector set the timer for the earliest key that hasn't yet
passed its collection time, rather than the earliest key that hasn't yet
expired.

Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: James Morris <jmorris@namei.org>
This commit is contained in:
David Howells 2009-09-16 15:54:14 +01:00 committed by James Morris
parent 0afd9056f1
commit 606531c316
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
security/keys/gc.c
View File

@ -169,9 +169,9 @@ static void key_garbage_collector(struct work_struct *work)
/* trawl through the keys looking for keyrings */ /* trawl through the keys looking for keyrings */
for (;;) { for (;;) {
if (key->expiry > now && key->expiry < new_timer) { if (key->expiry > limit && key->expiry < new_timer) {
kdebug("will expire %x in %ld", kdebug("will expire %x in %ld",
key_serial(key), key->expiry - now); key_serial(key), key->expiry - limit);
new_timer = key->expiry; new_timer = key->expiry;
} }