Eric Biggers 29997a6fa6 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:14:25 +01:00
..
9p	9p: missing chunk of "fs/9p: Don't update file type when updating file attributes"	2022-06-22 14:13:12 +02:00
adfs
affs
afs	afs: Return -EAGAIN, not -EREMOTEIO, when a file already locked	2022-09-23 14:17:00 +02:00
autofs
befs
bfs
btrfs	btrfs: fix ulist leaks in error paths of qgroup self tests	2022-11-10 18:14:19 +01:00
cachefiles
ceph	ceph: don't truncate file in atomic_open	2022-10-15 07:55:50 +02:00
cifs	cifs: Fix xid leak in cifs_ses_add_channel()	2022-10-30 09:41:17 +01:00
coda
configfs	configfs: fix a race in configfs_{,un}register_subsystem()	2022-03-02 11:42:52 +01:00
cramfs
crypto	fscrypt: fix keyring memory leak on mount failure	2022-11-10 18:14:25 +01:00
debugfs	debugfs: add debugfs_lookup_and_remove()	2022-09-15 11:32:03 +02:00
devpts	fsnotify: fix fsnotify hooks in pseudo filesystems	2022-02-01 17:25:39 +01:00
dlm	fs: dlm: handle -EBUSY first in lock arg validation	2022-10-26 13:25:08 +02:00
ecryptfs
efivarfs
efs
erofs	erofs: avoid consecutive detection for Highmem memory	2022-08-21 15:15:35 +02:00
exfat	exfat: check if cluster num is valid	2022-06-06 08:42:42 +02:00
exportfs
ext2	ext2: Add more validity checks for inode counts	2022-08-21 15:15:28 +02:00
ext4	ext4: continue to expand file system when the target size doesn't reach	2022-10-26 13:25:56 +02:00
f2fs	f2fs: fix wrong condition to trigger background checkpoint correctly	2022-10-26 13:25:56 +02:00
fat	fat: add ratelimit to fat*_ent_bread()	2022-06-09 10:20:58 +02:00
freevxfs
fscache
fuse	fuse: Remove the control interface for virtio-fs	2022-08-21 15:16:10 +02:00
gfs2	gfs2: use i_lock spin_lock for inode qadata	2022-06-09 10:20:57 +02:00
hfs
hfsplus
hostfs
hpfs
hugetlbfs	mm, hugetlb: allow for "high" userspace addresses	2022-04-27 13:53:54 +02:00
iomap	xfs: use current->journal_info for detecting transaction recursion	2022-07-07 17:52:19 +02:00
isofs	isofs: Fix out of bound access for corrupted isofs image	2021-11-12 14:58:33 +01:00
jbd2	jbd2: add miss release buffer head in fc_do_one_pass()	2022-10-26 13:25:13 +02:00
jffs2	jffs2: fix memory leak in jffs2_do_fill_super	2022-06-14 18:32:35 +02:00
jfs	fs: jfs: fix possible NULL pointer dereference in dbFree()	2022-06-09 10:20:57 +02:00
kernfs	kernfs: fix use-after-free in __kernfs_remove	2022-11-03 23:57:50 +09:00
lockd
minix	minix: fix bug when opening a file with O_DIRECT	2022-04-13 21:01:01 +02:00
nfs	nfs4: Fix kmemleak when allocate slot failed	2022-11-10 18:14:16 +01:00
nfs_common
nfsd	NFSD: fix use-after-free on source server when doing inter-server copy	2022-10-26 13:25:45 +02:00
nilfs2	nilfs2: replace WARN_ONs by nilfs_error for checkpoint acquisition failure	2022-10-15 07:55:50 +02:00
nls
notify	fsnotify: fix wrong lockdep annotations	2022-06-09 10:21:03 +02:00
ntfs	ntfs: fix BUG_ON in ntfs_lookup_inode_by_name()	2022-10-05 10:38:39 +02:00
ocfs2	ocfs2: fix BUG when iput after ocfs2_mknod fails	2022-10-30 09:41:15 +01:00
omfs
openpromfs
orangefs	orangefs: Fix the size of a memory allocation in orangefs_bufmap_alloc()	2022-01-20 09:17:50 +01:00
overlayfs	ovl: drop WARN_ON() dentry is NULL in ovl_encode_fh()	2022-08-21 15:15:23 +02:00
proc	mm: /proc/pid/smaps_rollup: fix no vma's null-deref	2022-10-30 09:41:19 +01:00
pstore	pstore: Don't use semaphores in always-atomic-context code	2022-04-08 14:39:56 +02:00
qnx4
qnx6
quota	quota: Check next/prev free block number after reading from quota file	2022-10-26 13:25:09 +02:00
ramfs
reiserfs
romfs
squashfs
sysfs
sysv
tracefs	tracefs: Only clobber mode/uid/gid on remount if asked	2022-09-20 12:38:31 +02:00
ubifs	ubifs: Rectify space amount budget for mkdir/tmpfile operations	2022-04-13 21:00:53 +02:00
udf	udf: Fix NULL ptr deref when converting from inline format	2022-02-01 17:25:39 +01:00
ufs
unicode
vboxsf
verity
xfs	xfs: validate inode fork size against fork format	2022-09-28 11:10:29 +02:00
zonefs	zonefs: fix zonefs_iomap_begin() for reads	2022-06-25 15:16:08 +02:00
aio.c	aio: fix use-after-free due to missing POLLFREE handling	2021-12-14 11:32:40 +01:00
anon_inodes.c
attr.c	vfs: Check the truncate maximum size in inode_newsize_ok()	2022-08-21 15:15:22 +02:00
bad_inode.c
binfmt_aout.c
binfmt_elf_fdpic.c	coredump: Snapshot the vmas in do_coredump	2022-04-08 14:40:44 +02:00
binfmt_elf.c	fs/binfmt_elf: Fix memory leak in load_elf_binary()	2022-11-03 23:57:49 +09:00
binfmt_em86.c
binfmt_flat.c	binfmt_flat: do not stop relocating GOT entries prematurely on riscv	2022-06-09 10:20:47 +02:00
binfmt_misc.c
binfmt_script.c
block_dev.c
buffer.c
char_dev.c
compat_binfmt_elf.c
coredump.c	coredump: Use the vma snapshot in fill_files_note	2022-04-08 14:40:45 +02:00
d_path.c
dax.c	dax: fix cache flush on PMD-mapped pages	2022-06-09 10:21:16 +02:00
dcache.c
dcookies.c
direct-io.c
drop_caches.c
eventfd.c
eventpoll.c	epoll: autoremove wakers even more aggressively	2022-08-21 15:15:28 +02:00
exec.c	exec: Copy oldsighand->action under spin-lock	2022-11-03 23:57:49 +09:00
fcntl.c	fcntl: fix potential deadlocks for &fown_struct.lock	2022-10-30 09:41:18 +01:00
fhandle.c
file_table.c	SUNRPC: Ensure we flush any closed sockets before xs_xprt_free()	2022-05-18 10:23:48 +02:00
file.c	fs: fix fd table size alignment properly	2022-04-08 14:40:30 +02:00
filesystems.c
fs_context.c	memcg: charge fs_context and legacy_fs_context	2022-02-08 18:30:36 +01:00
fs_parser.c
fs_pin.c
fs_struct.c
fs_types.c
fs-writeback.c	fs-writeback: writeback_sb_inodes：Recalculate 'wrote' according skipped pages	2022-06-09 10:21:22 +02:00
fsopen.c
init.c
inode.c	fs: fix UAF/GPF bug in nilfs_mdt_destroy	2022-10-15 07:55:51 +02:00
internal.h
io_uring.c	io_uring/af_unix: defer registered files gc to io_uring release	2022-10-26 13:25:55 +02:00
io-wq.c
io-wq.h
ioctl.c	fs: fix an infinite loop in iomap_fiemap	2022-05-25 09:17:54 +02:00
Kconfig
Kconfig.binfmt
kernel_read_file.c	vfs: check fd has read access in kernel_read_file_from_fd()	2021-10-27 09:56:51 +02:00
libfs.c
locks.c
Makefile
mbcache.c
mount.h
mpage.c
namei.c	__follow_mount_rcu(): verify that mount_lock remains unchanged	2022-08-21 15:16:15 +02:00
namespace.c
no-block.c
nsfs.c
open.c
pipe.c	pipe: Fix missing lock in pipe_resize_ring()	2022-06-06 08:42:41 +02:00
pnode.c
pnode.h
posix_acl.c
proc_namespace.c
read_write.c
readdir.c
remap_range.c	fs/remap: constrain dedupe of EOF blocks	2022-07-21 21:20:01 +02:00
select.c	select: Fix indefinitely sleeping task in poll_schedule_timeout()	2022-01-29 10:26:11 +01:00
seq_file.c
signalfd.c	io_uring: disable polling pollfree files	2022-09-05 10:28:58 +02:00
splice.c	Revert "fs: check FMODE_LSEEK to control internal pipe splicing"	2022-10-17 17:26:07 +02:00
stack.c
stat.c	stat: fix inconsistency between struct stat and struct compat_stat	2022-04-27 13:53:54 +02:00
statfs.c
super.c	fscrypt: fix keyring memory leak on mount failure	2022-11-10 18:14:25 +01:00
sync.c	vfs: make sync_filesystem return errors from ->sync_fs	2022-08-31 17:15:14 +02:00
timerfd.c
userfaultfd.c	userfaultfd: open userfaultfds with O_RDONLY	2022-10-26 13:25:17 +02:00
utimes.c
xattr.c