KEYS: Fix race between key destruction and finding a keyring by name
authorDavid Howells <dhowells@redhat.com>
Fri, 25 Sep 2015 15:30:08 +0000 (16:30 +0100)
committerBen Hutchings <ben@decadent.org.uk>
Tue, 17 Nov 2015 15:54:46 +0000 (15:54 +0000)
commit650f6aa8c3c805bd41c4243aadbd63558f39fd32
treef7a391739bf8da9bf4347a3e14d36ae54888c163
parent3553e5d34d72a3aac5d967ec8b4d45a88340d679
KEYS: Fix race between key destruction and finding a keyring by name

commit 94c4554ba07adbdde396748ee7ae01e86cf2d8d7 upstream.

There appears to be a race between:

 (1) key_gc_unused_keys() which frees key->security and then calls
     keyring_destroy() to unlink the name from the name list

 (2) find_keyring_by_name() which calls key_permission(), thus accessing
     key->security, on a key before checking to see whether the key usage is 0
     (ie. the key is dead and might be cleaned up).

Fix this by calling ->destroy() before cleaning up the core key data -
including key->security.

Reported-by: Petr Matousek <pmatouse@redhat.com>
Signed-off-by: David Howells <dhowells@redhat.com>
[carnil: Backported to 3.2: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
security/keys/gc.c