Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 18c43e67 authored by Eric Biggers's avatar Eric Biggers Committed by Greg Kroah-Hartman
Browse files

UPSTREAM: fscrypt: fix dereference of NULL user_key_payload



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: default avatarJames Morris <james.l.morris@oracle.com>
Cc: <stable@vger.kernel.org>    [v4.1+]
Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
(cherry-picked from commit d60b5b7854c3d135b869f74fb93eaf63cbb1991a
 and fixed up for android-3.18)
Change-Id: I7522324dc41969b5401fbe88ff90b4cd1f049cf2
Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
parent 4a53a837
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment