linux-stable/fs/crypto
Eric Biggers 0b1747653b fscrypt: fix keyring memory leak on mount failure
commit ccd30a476f upstream.

Commit d7e7b9af10 ("fscrypt: stop using keyrings subsystem for
fscrypt_master_key") moved the keyring destruction from __put_super() to
generic_shutdown_super() so that the filesystem's block device(s) are
still available.  Unfortunately, this causes a memory leak in the case
where a mount is attempted with the test_dummy_encryption mount option,
but the mount fails after the option has already been processed.

To fix this, attempt the keyring destruction in both places.

Reported-by: syzbot+104c2a89561289cec13e@syzkaller.appspotmail.com
Fixes: d7e7b9af10 ("fscrypt: stop using keyrings subsystem for fscrypt_master_key")
Signed-off-by: Eric Biggers <ebiggers@google.com>
Reviewed-by: Christian Brauner (Microsoft) <brauner@kernel.org>
Link: https://lore.kernel.org/r/20221011213838.209879-1-ebiggers@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2022-11-10 18:17:30 +01:00
..
Kconfig
Makefile
bio.c block: pass a block_device and opf to bio_reset 2022-02-02 07:50:00 -07:00
crypto.c fscrypt: split up FS_CRYPTO_BLOCK_SIZE 2022-04-13 15:03:09 -07:00
fname.c fscrypt: export fscrypt_fname_encrypt and fscrypt_fname_encrypted_size 2022-08-03 00:54:11 +02:00
fscrypt_private.h fscrypt: stop using keyrings subsystem for fscrypt_master_key 2022-11-10 18:17:30 +01:00
hkdf.c fscrypt: allow 256-bit master keys with AES-256-XTS 2021-09-22 11:29:38 -07:00
hooks.c fscrypt: stop using keyrings subsystem for fscrypt_master_key 2022-11-10 18:17:30 +01:00
inline_crypt.c fscrypt: log when starting to use inline encryption 2022-04-13 22:35:25 -07:00
keyring.c fscrypt: fix keyring memory leak on mount failure 2022-11-10 18:17:30 +01:00
keysetup.c fscrypt: stop using keyrings subsystem for fscrypt_master_key 2022-11-10 18:17:30 +01:00
keysetup_v1.c
policy.c fscrypt: stop using keyrings subsystem for fscrypt_master_key 2022-11-10 18:17:30 +01:00