summaryrefslogtreecommitdiff
path: root/security/keys/encrypted-keys/encrypted.c
diff options
context:
space:
mode:
authorEric Biggers <ebiggers@google.com>2017-10-09 12:46:18 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-10-27 10:38:10 +0200
commitb2ac5d4516fbe210a328b4b9fe65b80b3e731dee (patch)
tree0a5adc7795ce4b0946fcc87312e39202d5002391 /security/keys/encrypted-keys/encrypted.c
parentf374505b79104e8cbc6618c301f1cbb4058480bb (diff)
fscrypt: fix dereference of NULL user_key_payload
commit d60b5b7854c3d135b869f74fb93eaf63cbb1991a upstream. When an fscrypt-encrypted file is opened, we request the file's master key from the keyrings service as a logon key, then access its payload. However, a revoked key has a NULL payload, and we failed to check for this. request_key() *does* skip revoked keys, but there is still a window where the key can be revoked before we acquire its semaphore. Fix it by checking for a NULL payload, treating it like a key which was already revoked at the time it was requested. Fixes: 88bd6ccdcdd6 ("ext4 crypto: add encryption key management facilities") Reviewed-by: James Morris <james.l.morris@oracle.com> Signed-off-by: Eric Biggers <ebiggers@google.com> Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'security/keys/encrypted-keys/encrypted.c')
0 files changed, 0 insertions, 0 deletions