Commit b24e77ef authored by Ye Bin's avatar Ye Bin Committed by Theodore Ts'o
Browse files

ext4: avoid remove directory when directory is corrupted 



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: default avatarYe Bin <yebin10@huawei.com>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Link: https://lore.kernel.org/r/20220622090223.682234-1-yebin10@huawei.com


Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent c64a9299

fs/ext4/namei.c

+2 −5
Original line number Diff line number Diff line
@@ -3067,11 +3067,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;

		}