diff options
author | Eric Biggers <ebiggers@google.com> | 2022-10-12 00:38:38 +0300 |
---|---|---|
committer | Eric Biggers <ebiggers@google.com> | 2022-10-20 06:54:43 +0300 |
commit | ccd30a476f8e864732de220bd50e6f372f5ebcab (patch) | |
tree | f5a57819df1068b8d13c5a897bb2b94b47890466 /include/net/llc_if.h | |
parent | 9abf2313adc1ca1b6180c508c25f22f9395cc780 (diff) | |
download | linux-ccd30a476f8e864732de220bd50e6f372f5ebcab.tar.xz |
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
Diffstat (limited to 'include/net/llc_if.h')
0 files changed, 0 insertions, 0 deletions