diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-10-20 16:09:36 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-10-20 16:09:36 +0900 |
| commit | ce1fad2740c648a4340f6f6c391a8a83769d2e8c (patch) | |
| tree | 8d19a392845cae4ca37639ace41105c34a7b20d1 /security/keys/gc.c | |
| parent | 1099f86044111e9a7807f09523e42d4c9d0fb781 (diff) | |
| parent | 911b79cde95c7da0ec02f48105358a36636b7a71 (diff) | |
| download | linux-ce1fad2740c648a4340f6f6c391a8a83769d2e8c.tar.gz linux-ce1fad2740c648a4340f6f6c391a8a83769d2e8c.tar.bz2 linux-ce1fad2740c648a4340f6f6c391a8a83769d2e8c.zip | |
Merge branch 'keys-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs
Pull key handling fixes from David Howells:
"Here are two patches, the first of which at least should go upstream
immediately:
(1) Prevent a user-triggerable crash in the keyrings destructor when a
negatively instantiated keyring is garbage collected. I have also
seen this triggered for user type keys.
(2) Prevent the user from using requesting that a keyring be created
and instantiated through an upcall. Doing so is probably safe
since the keyring type ignores the arguments to its instantiation
function - but we probably shouldn't let keyrings be created in
this manner"
* 'keys-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs:
KEYS: Don't permit request_key() to construct a new keyring
KEYS: Fix crash when attempt to garbage collect an uninstantiated keyring
Diffstat (limited to 'security/keys/gc.c')
| -rw-r--r-- | security/keys/gc.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/security/keys/gc.c b/security/keys/gc.c index 39eac1fd5706..addf060399e0 100644 --- a/security/keys/gc.c +++ b/security/keys/gc.c @@ -134,8 +134,10 @@ static noinline void key_gc_unused_keys(struct list_head *keys) kdebug("- %u", key->serial); key_check(key); - /* Throw away the key data */ - if (key->type->destroy) + /* Throw away the key data if the key is instantiated */ + if (test_bit(KEY_FLAG_INSTANTIATED, &key->flags) && + !test_bit(KEY_FLAG_NEGATIVE, &key->flags) && + key->type->destroy) key->type->destroy(key); security_key_free(key); |