fscrypt: fix keyring memory leak on mount failure
authorEric Biggers <ebiggers@google.com>
Tue, 11 Oct 2022 21:38:38 +0000 (14:38 -0700)
committerEric Biggers <ebiggers@google.com>
Thu, 20 Oct 2022 03:54:43 +0000 (20:54 -0700)
commitccd30a476f8e864732de220bd50e6f372f5ebcab
treef5a57819df1068b8d13c5a897bb2b94b47890466
parent9abf2313adc1ca1b6180c508c25f22f9395cc780
fscrypt: fix keyring memory leak on mount failure

Commit d7e7b9af104c ("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: d7e7b9af104c ("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
fs/crypto/keyring.c
fs/super.c
include/linux/fscrypt.h