diff --git a/[refs] b/[refs]
index 823c4a7365bc..19cf10cc9f7c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fc1caf6eafb30ea185720e29f7f5eccca61ecd60
+refs/heads/master: 1e456a124353a753e9d1fadfbf5cd459c2f197ae
diff --git a/trunk/security/keys/request_key.c b/trunk/security/keys/request_key.c
index 0d26f689bd77..0088dd8bf68a 100644
--- a/trunk/security/keys/request_key.c
+++ b/trunk/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);