]> git.dujemihanovic.xyz Git - linux.git/commit
fscrypt: check for NULL keyring in fscrypt_put_master_key_activeref()
authorEric Biggers <ebiggers@google.com>
Mon, 13 Mar 2023 22:12:31 +0000 (15:12 -0700)
committerEric Biggers <ebiggers@google.com>
Sun, 19 Mar 2023 04:08:03 +0000 (21:08 -0700)
commit4bcf6f827a79c59806c695dc280e763c5b6a6813
tree5bb1c9c42c6028396fac9e88ac5a4f27470f3f84
parent43e5f1d5921128373743585e3275ed9044ef8b8f
fscrypt: check for NULL keyring in fscrypt_put_master_key_activeref()

It is a bug for fscrypt_put_master_key_activeref() to see a NULL
keyring.  But it used to be possible due to the bug, now fixed, where
fscrypt_destroy_keyring() was called before security_sb_delete().  To be
consistent with how fscrypt_destroy_keyring() uses WARN_ON for the same
issue, WARN and leak the fscrypt_master_key if the keyring is NULL
instead of dereferencing the NULL pointer.

This is a robustness improvement, not a fix.

Link: https://lore.kernel.org/r/20230313221231.272498-4-ebiggers@kernel.org
Signed-off-by: Eric Biggers <ebiggers@google.com>
fs/crypto/keyring.c