summaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2015-10-19 11:20:28 +0100
committerDavid Howells <dhowells@redhat.com>2015-10-19 11:24:51 +0100
commit911b79cde95c7da0ec02f48105358a36636b7a71 (patch)
tree623ed8957cae8115b835018968fec344fba9677d /security
parentf05819df10d7b09f6d1eb6f8534a8f68e5a4fe61 (diff)
downloadlinux-stable-911b79cde95c7da0ec02f48105358a36636b7a71.tar.gz
linux-stable-911b79cde95c7da0ec02f48105358a36636b7a71.tar.bz2
linux-stable-911b79cde95c7da0ec02f48105358a36636b7a71.zip
KEYS: Don't permit request_key() to construct a new keyring
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>
Diffstat (limited to 'security')
-rw-r--r--security/keys/request_key.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/security/keys/request_key.c b/security/keys/request_key.c
index 486ef6fa393b..0d6253124278 100644
--- a/security/keys/request_key.c
+++ b/security/keys/request_key.c
@@ -440,6 +440,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);