aboutsummaryrefslogtreecommitdiffstats
path: root/security/keys
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2010-08-06 16:08:27 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-06 09:17:02 -0700
commit1e456a124353a753e9d1fadfbf5cd459c2f197ae (patch)
tree4977d4fa275faafc0ba99a635d4c853a1f0df2a1 /security/keys
parentfc1caf6eafb30ea185720e29f7f5eccca61ecd60 (diff)
downloadmrst-s0i3-test-1e456a124353a753e9d1fadfbf5cd459c2f197ae.tar.gz
mrst-s0i3-test-1e456a124353a753e9d1fadfbf5cd459c2f197ae.tar.xz
mrst-s0i3-test-1e456a124353a753e9d1fadfbf5cd459c2f197ae.zip
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 <dhowells@redhat.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'security/keys')
-rw-r--r--security/keys/request_key.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/security/keys/request_key.c b/security/keys/request_key.c
index 0d26f689bd7..0088dd8bf68 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);