Commit 5bebfd60 authored Jun 22, 2022 by Ye Bin Committed by Greg Kroah-Hartman Aug 25, 2022

ext4: avoid remove directory when directory is corrupted



[ Upstream commit b24e77ef1c6d4dbf42749ad4903c97539cc9755a ]

Now if check directoy entry is corrupted, ext4_empty_dir may return true
then directory will be removed when file system mounted with "errors=continue".
In order not to make things worse just return false when directory is corrupted.

Signed-off-by: Ye Bin <yebin10@huawei.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Link: https://lore.kernel.org/r/20220622090223.682234-1-yebin10@huawei.com


Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent f5d46f1b

fs/ext4/namei.c

+2 −5

Original line number	Diff line number	Diff line
		@@ -2929,11 +2929,8 @@ bool ext4_empty_dir(struct inode *inode)
		de = (struct ext4_dir_entry_2 *) (bh->b_data +
		(offset & (sb->s_blocksize - 1)));
		if (ext4_check_dir_entry(inode, NULL, de, bh,
		bh->b_data, bh->b_size, offset)) {
		offset = (offset \| (sb->s_blocksize - 1)) + 1;
		continue;
		}
		if (le32_to_cpu(de->inode)) {
		bh->b_data, bh->b_size, offset) \|\|
		le32_to_cpu(de->inode)) {
		brelse(bh);
		return false;
		}