diff options
| author | David Howells <dhowells@redhat.com> | 2015-10-19 11:20:28 +0100 |
|---|---|---|
| committer | Luis Henriques <luis.henriques@canonical.com> | 2015-10-28 10:33:23 +0000 |
| commit | ca564ff22ac0960f1d362ffa77d2d20d5f85ac06 (patch) | |
| tree | 2f1c8cf716f8c6a54fd0df118a15c0d4dea37106 /security | |
| parent | 4944cea73316e816c30533d02f6c0434a5011751 (diff) | |
| download | linux-stable-ca564ff22ac0960f1d362ffa77d2d20d5f85ac06.tar.gz linux-stable-ca564ff22ac0960f1d362ffa77d2d20d5f85ac06.tar.bz2 linux-stable-ca564ff22ac0960f1d362ffa77d2d20d5f85ac06.zip | |
KEYS: Don't permit request_key() to construct a new keyring
commit 911b79cde95c7da0ec02f48105358a36636b7a71 upstream.
If request_key() is used to find a keyring, only do the search part - don't
do the construction part if the keyring was not found by the search. We
don't really want keyrings in the negative instantiated state since the
rejected/negative instantiation error value in the payload is unioned with
keyring metadata.
Now the kernel gives an error:
request_key("keyring", "#selinux,bdekeyring", "keyring", KEY_SPEC_USER_SESSION_KEYRING) = -1 EPERM (Operation not permitted)
Signed-off-by: David Howells <dhowells@redhat.com>
Cc: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
Diffstat (limited to 'security')
| -rw-r--r-- | security/keys/request_key.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/security/keys/request_key.c b/security/keys/request_key.c index 381411941cc1..9ea60a7bac78 100644 --- a/security/keys/request_key.c +++ b/security/keys/request_key.c @@ -457,6 +457,9 @@ static struct key *construct_key_and_link(struct keyring_search_context *ctx, kenter(""); + if (ctx->index_key.type == &key_type_keyring) + return ERR_PTR(-EPERM); + user = key_user_lookup(current_fsuid()); if (!user) return ERR_PTR(-ENOMEM); |