Ye Bin b35eb48471 ext4: fix fs corruption when tring to remove a non-empty directory with IO error ... commit 7aab5c84a0f6ec2290e2ba4a6b245178b1bf949a upstream. We inject IO error when rmdir non empty direcory, then got issue as follows: step1: mkfs.ext4 -F /dev/sda step2: mount /dev/sda test step3: cd test step4: mkdir -p 1/2 step5: rmdir 1 [ 110.920551] ext4_empty_dir: inject fault [ 110.921926] EXT4-fs warning (device sda): ext4_rmdir:3113: inode #12: comm rmdir: empty directory '1' has too many links (3) step6: cd .. step7: umount test step8: fsck.ext4 -f /dev/sda e2fsck 1.42.9 (28-Dec-2013) Pass 1: Checking inodes, blocks, and sizes Pass 2: Checking directory structure Entry '..' in .../??? (13) has deleted/unused inode 12. Clear<y>? yes Pass 3: Checking directory connectivity Unconnected directory inode 13 (...) Connect to /lost+found<y>? yes Pass 4: Checking reference counts Inode 13 ref count is 3, should be 2. Fix<y>? yes Pass 5: Checking group summary information /dev/sda: ***** FILE SYSTEM WAS MODIFIED ***** /dev/sda: 12/131072 files (0.0% non-contiguous), 26157/524288 blocks ext4_rmdir if (!ext4_empty_dir(inode)) goto end_rmdir; ext4_empty_dir bh = ext4_read_dirblock(inode, 0, DIRENT_HTREE); if (IS_ERR(bh)) return true; Now if read directory block failed, 'ext4_empty_dir' will return true, assume directory is empty. Obviously, it will lead to above issue. To solve this issue, if read directory block failed 'ext4_empty_dir' just return false. To avoid making things worse when file system is already corrupted, 'ext4_empty_dir' also return false. Signed-off-by: Ye Bin <yebin10@huawei.com> Cc: stable@kernel.org Link: https://lore.kernel.org/r/20220228024815.3952506-1-yebin10@huawei.com Signed-off-by: Theodore Ts'o <tytso@mit.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>		2022-04-08 14:39:55 +02:00
..
9p	9p: only copy valid iattrs in 9P2000.L setattr implementation	2022-01-20 09:17:50 +01:00
adfs	Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2020-10-24 12:26:05 -07:00
affs	fs/affs: release old buffer head on error path	2021-03-04 11:38:37 +01:00
afs	afs: Fix updating of i_blocks on file/dir extension	2021-09-30 10:11:01 +02:00
autofs	autofs: harden ioctl table	2020-10-16 11:11:22 -07:00
befs
bfs	bfs: don't use WARNING: string when it's just info.	2021-01-06 14:56:52 +01:00
btrfs	btrfs: add missing run of delayed items after unlink during log replay	2022-03-08 19:09:38 +01:00
cachefiles	fs/cachefiles: Remove wait_bit_key layout dependency	2021-03-30 14:32:07 +02:00
ceph	ceph: set pool_ns in new inode layout for async creates	2022-02-01 17:25:39 +01:00
cifs	cifs: fix NULL ptr dereference in smb2_ioctl_query_info()	2022-04-08 14:39:53 +02:00
coda
configfs	configfs: fix a race in configfs_{,un}register_subsystem()	2022-03-02 11:42:52 +01:00
cramfs
crypto	fscrypt: allow 256-bit master keys with AES-256-XTS	2021-11-18 14:03:54 +01:00
debugfs	debugfs: lockdown: Allow reading debugfs files that are not world readable	2022-01-27 10:54:02 +01:00
devpts	fsnotify: fix fsnotify hooks in pseudo filesystems	2022-02-01 17:25:39 +01:00
dlm	fs: dlm: filter user dlm messages for kernel locks	2022-01-27 10:54:10 +01:00
ecryptfs	Revert "ecryptfs: replace BUG_ON with error handling code"	2021-05-26 12:06:55 +02:00
efivarfs	efivarfs: revert "fix memory leak in efivarfs_create()"	2020-11-25 16:55:02 +01:00
efs
erofs	erofs: fix deadlock when shrink erofs slab	2021-12-01 09:19:05 +01:00
exfat	exfat: avoid incorrectly releasing for root inode	2022-03-28 09:57:07 +02:00
exportfs
ext2	ext2: fix sleeping in atomic bugs on error	2021-10-09 14:40:56 +02:00
ext4	ext4: fix fs corruption when tring to remove a non-empty directory with IO error	2022-04-08 14:39:55 +02:00
f2fs	f2fs: fix to do sanity check on .cp_pack_total_block_count	2022-04-08 14:39:51 +02:00
fat
freevxfs
fscache	fscache: Fix cookie key hashing	2021-09-18 13:40:15 +02:00
fuse	fuse: fix pipe buffer lifetime for direct_io	2022-03-16 14:16:01 +01:00
gfs2	gfs2: Fix length of holes reported at end-of-file	2021-12-08 09:03:18 +01:00
hfs	hfs: add lock nesting notation to hfs_find_init	2021-07-31 08:16:12 +02:00
hfsplus	hfsplus: prevent corruption in shrinking truncate	2021-05-19 10:13:10 +02:00
hostfs	hostfs: fix memory handling in follow_link()	2021-04-14 08:42:06 +02:00
hpfs
hugetlbfs	hugetlbfs: fix mount mode command line processing	2021-07-28 14:35:46 +02:00
iomap	treewide: Change list_sort to use const pointers	2021-09-30 10:11:04 +02:00
isofs	isofs: Fix out of bound access for corrupted isofs image	2021-11-12 14:58:33 +01:00
jbd2	jbd2: export jbd2_journal_[grab|put]_journal_head	2022-02-01 17:25:41 +01:00
jffs2	jffs2: fix memory leak in jffs2_scan_medium	2022-04-08 14:39:52 +02:00
jfs	JFS: fix memleak in jfs_mount	2021-11-18 14:04:15 +01:00
kernfs	kernfs: wire up ->splice_read and ->splice_write	2021-01-27 11:55:29 +01:00
lockd	lockd: lockd server-side shouldn't set fl_ops	2021-09-18 13:40:30 +02:00
minix
nfs	NFS: Don't set NFS_INO_INVALID_XATTR if there is no xattr cache	2022-02-23 12:01:05 +01:00
nfs_common	nfs_common: need lock during iterate through the list	2020-12-30 11:53:45 +01:00
nfsd	NFSD: prevent underflow in nfssvc_decode_writeargs()	2022-04-08 14:39:51 +02:00
nilfs2	nilfs2: fix memory leak in nilfs_sysfs_delete_snapshot_group	2021-09-26 14:09:01 +02:00
nls
notify	fanotify: Fix stale file descriptor in copy_event_to_user()	2022-02-05 12:37:56 +01:00
ntfs	ntfs: fix validity check for file name attribute	2021-07-14 16:55:38 +02:00
ocfs2	ocfs2: fix crash when initialize filecheck kobj fails	2022-03-23 09:13:27 +01:00
omfs	fs: omfs: use kmemdup() rather than kmalloc+memcpy	2020-09-22 23:39:45 -04:00
openpromfs
orangefs	orangefs: Fix the size of a memory allocation in orangefs_bufmap_alloc()	2022-01-20 09:17:50 +01:00
overlayfs	ovl: fix warning in ovl_create_real()	2021-12-22 09:30:58 +01:00
proc	fs/proc: task_mmu.c: don't read mapcount for migration entry	2022-02-23 12:00:56 +01:00
pstore	mark pstore-blk as broken	2021-07-14 16:56:12 +02:00
qnx4	qnx4: work around gcc false positive warning bug	2021-09-30 10:11:08 +02:00
qnx6
quota	quota: make dquot_quota_sync return errors from ->sync_fs	2022-02-23 12:00:59 +01:00
ramfs	ramfs: fix nommu mmap with gaps in the page cache	2020-10-16 11:11:22 -07:00
reiserfs	reiserfs: check directory items on read from disk	2021-08-12 13:22:19 +02:00
romfs	Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2020-10-24 12:26:05 -07:00
squashfs	squashfs: fix divide error in calculate_skip()	2021-05-19 10:13:10 +02:00
sysfs	sysfs: Add sysfs_emit and sysfs_emit_at to format sysfs output	2020-10-02 12:02:30 +02:00
sysv
tracefs	tracefs: Set the group ownership in apply_options() not parse_options()	2022-03-02 11:42:54 +01:00
ubifs	ubifs: Error path in ubifs_remount_rw() seems to wrongly free write buffers	2022-01-27 10:54:24 +01:00
udf	udf: Fix NULL ptr deref when converting from inline format	2022-02-01 17:25:39 +01:00
ufs	Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2020-10-24 12:26:05 -07:00
unicode
vboxsf	vboxfs: fix broken legacy mount signature checking	2021-10-17 10:43:33 +02:00
verity	fs-verity: fix signed integer overflow with i_size near S64_MAX	2021-10-06 15:55:46 +02:00
xfs	xfs: map unwritten blocks in XFS_IOC_{ALLOC,FREE}SP just like fallocate	2022-01-11 15:25:01 +01:00
zonefs	zonefs: add MODULE_ALIAS_FS	2021-12-22 09:30:57 +01: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
bad_inode.c
binfmt_aout.c
binfmt_elf_fdpic.c	binfmt_elf, binfmt_elf_fdpic: use a VMA list snapshot	2020-10-16 11:11:21 -07:00
binfmt_elf.c	elf: don't use MAP_FIXED_NOREPLACE for elf interpreter mappings	2021-10-06 15:55:59 +02:00
binfmt_em86.c
binfmt_flat.c
binfmt_misc.c	binfmt_misc: fix possible deadlock in bm_register_write	2021-03-17 17:06:35 +01:00
binfmt_script.c
block_dev.c	block: fix a race between del_gendisk and BLKRRPART	2021-06-03 09:00:45 +02:00
buffer.c	mm, memcg: rework remote charging API to support nesting	2020-10-18 09:27:09 -07:00
char_dev.c
compat_binfmt_elf.c
coredump.c	coredump: Also dump first pages of non-executable ELF libraries	2022-04-08 14:39:55 +02:00
d_path.c	fs: fix NULL dereference due to data race in prepend_path()	2020-10-14 14:54:45 -07:00
dax.c	dax: fix ENOMEM handling in grab_mapping_entry()	2021-07-14 16:56:13 +02:00
dcache.c
dcookies.c
direct-io.c	fs: direct-io: fix missing sdio->boundary	2021-04-14 08:41:58 +02:00
drop_caches.c
eventfd.c
eventpoll.c	fs/epoll: restore waking from ep_done_scan()	2021-05-11 14:47:12 +02:00
exec.c	Revert "Add a reference to ucounts for each cred"	2021-09-08 08:49:00 +02:00
fcntl.c	fcntl: fix potential deadlock for &fasync_struct.fa_lock	2021-09-15 09:50:27 +02:00
fhandle.c
file_table.c	task_work: cleanup notification modes	2020-10-17 15:05:30 -06:00
file.c	fget: clarify and improve __fget_files() implementation	2022-02-23 12:00:56 +01: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_parse: mark fs_param_bad_value() as static	2020-10-13 18:38:27 -07:00
fs_pin.c
fs_struct.c
fs_types.c
fs-writeback.c	writeback: fix obtain a reference to a freeing memcg css	2021-07-14 16:56:31 +02:00
fsopen.c
init.c
inode.c	fs: export an inode_update_time helper	2021-11-26 10:39:22 +01:00
internal.h	cgroup1: fix leaked context root causing sporadic NULL deref in LTP	2021-07-31 08:16:11 +02:00
io_uring.c	io_uring: return back safer resurrect	2022-03-19 13:44:46 +01:00
io-wq.c	io-wq: fix wakeup race when adding new work	2021-09-18 13:40:06 +02:00
io-wq.h	io_uring: always batch cancel in *cancel_files()	2021-02-13 13:54:56 +01:00
ioctl.c
Kconfig	tmpfs: disallow CONFIG_TMPFS_INODE64 on alpha	2021-02-17 11:02:21 +01:00
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	libfs: fix error cast of negative value in simple_attr_write()	2020-11-22 10:48:22 -08:00
locks.c	Revert "nfsd4: a client's own opens needn't prevent delegations"	2021-03-20 10:43:44 +01:00
Makefile	Refactored code for 5.10:	2020-10-23 11:33:41 -07:00
mbcache.c
mount.h
mpage.c
namei.c	fsnotify: invalidate dcache before IN_DELETE event	2022-02-01 17:25:48 +01:00
namespace.c	fs: warn about impending deprecation of mandatory locks	2021-08-26 08:35:57 -04:00
no-block.c
nsfs.c
open.c	open: don't silently ignore unknown O-flags in openat2()	2021-07-14 16:55:59 +02:00
pipe.c	watch_queue: Fix lack of barrier/sync/lock between post and read	2022-03-16 14:16:02 +01:00
pnode.c
pnode.h	mount: fix mounting of detached mounts onto targets that reside on shared mounts	2021-03-17 17:06:13 +01:00
posix_acl.c
proc_namespace.c	proc mountinfo: make splice available again	2020-12-30 11:54:02 +01:00
read_write.c	Refactored code for 5.10:	2020-10-23 11:33:41 -07:00
readdir.c	readdir: make sure to verify directory entry for legacy interfaces too	2021-04-21 13:00:54 +02:00
remap_range.c	vfs: move the remap range helpers to remap_range.c	2020-10-15 09:48:49 -07:00
select.c	select: Fix indefinitely sleeping task in poll_schedule_timeout()	2022-01-29 10:26:11 +01:00
seq_file.c	seq_file: disallow extremely large seq buffer allocations	2021-07-20 16:05:59 +02:00
signalfd.c	signalfd: use wake_up_pollfree()	2021-12-14 11:32:40 +01:00
splice.c	io_uring-5.10-2020-10-24	2020-10-24 12:40:18 -07:00
stack.c
stat.c	fs: fix reporting supported extra file attributes for statx()	2021-05-11 14:47:33 +02:00
statfs.c
super.c	vfs: make freeze_super abort when sync_filesystem returns error	2022-02-23 12:00:59 +01:00
sync.c
timerfd.c
userfaultfd.c	userfaultfd: fix a race between writeprotect and exit_mmap()	2021-10-27 09:56:51 +02:00
utimes.c
xattr.c	fs/xattr.c: fix kernel-doc warnings for setxattr & removexattr	2020-10-13 18:38:27 -07:00