Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 1e456a124353a753e9d1fadfbf5cd459c2f197ae

Authored by David Howells
Committed by Linus Torvalds
1 parent fc1caf6eaf
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 1 changed file with 2 additions and 0 deletions Side-by-side Diff

security/keys/request_key.c
Diff comments   View file @ 1e456a1
... ... @@ -537,6 +537,8 @@
537 537 intr ? TASK_INTERRUPTIBLE : TASK_UNINTERRUPTIBLE);
538 538 if (ret < 0)
539 539 return ret;
  540 + if (test_bit(KEY_FLAG_NEGATIVE, &key->flags))
  541 + return -ENOKEY;
540 542 return key_validate(key);
541 543 }
542 544 EXPORT_SYMBOL(wait_for_key_construction);