From 1e456a124353a753e9d1fadfbf5cd459c2f197ae Mon Sep 17 00:00:00 2001 From: David Howells Date: Fri, 6 Aug 2010 16:08:27 +0100 Subject: KEYS: request_key() should return -ENOKEY if the constructed key is negative request_key() should return -ENOKEY if the key it constructs has been negatively instantiated. Without this, request_key() can return an unusable key to its caller, and if the caller then does key_validate() that won't catch the problem. Signed-off-by: David Howells Signed-off-by: Linus Torvalds --- security/keys/request_key.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'security') diff --git a/security/keys/request_key.c b/security/keys/request_key.c index 0d26f689bd77..0088dd8bf68a 100644 --- a/security/keys/request_key.c +++ b/security/keys/request_key.c @@ -537,6 +537,8 @@ int wait_for_key_construction(struct key *key, bool intr) intr ? TASK_INTERRUPTIBLE : TASK_UNINTERRUPTIBLE); if (ret < 0) return ret; + if (test_bit(KEY_FLAG_NEGATIVE, &key->flags)) + return -ENOKEY; return key_validate(key); } EXPORT_SYMBOL(wait_for_key_construction); -- cgit v1.2.3