linux-ext4 - [PATCH] e2fsck: process empty directory if large_dir and inline

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:   Fri, 14 Jun 2019 17:42:37 +0300
From:   Artem Blagodarenko <artem.blagodarenko@...il.com>
To:     linux-ext4@...r.kernel.org
Cc:     adilger.kernel@...ger.ca, linux@...musvillemoes.dk
Subject: [PATCH] e2fsck: process empty directory if large_dir and inline_data set

Doing a forced check on an ext4 file system with inline_data and
large_dir results in lots of fsck messages. To reproduce:

truncate -s 100000000 ext4.img
misc/mke2fs -t ext4 -I 512 -O 'inline_data,large_dir' ext4.img
mkdir m
sudo mount ext4.img m
mkdir m/aa
sudo umount m
e2fsck/e2fsck -f -n ext4.img

The last command gives this output:

[root@...alhost e2fsprogs-kernel]# e2fsck/e2fsck -f -n ext4-2.img
e2fsck 1.45.2 (27-May-2019)
Pass 1: Checking inodes, blocks, and sizes
Pass 2: Checking directory structure
Pass 3: Checking directory connectivity
'..' in /aa (12) is <The NULL inode> (0), should be / (2).
Fix? no

Pass 4: Checking reference counts
Inode 2 ref count is 4, should be 3.  Fix? no

Inode 12 ref count is 2, should be 1.  Fix? no

Pass 5: Checking group summary information

ext4-2.img: ********** WARNING: Filesystem still has errors **********

ext4-2.img: 12/24384 files (0.0% non-contiguous), 17874/97656 blocks

Rootcause of this issue is large_dir optimization that is not
appropriate for inline_data.

Let's not optimize it if inline_data is set.

Reported-by: Rasmus Villemoes <linux@...musvillemoes.dk>
Signed-off-by: Artem Blagodarenko <c17828@...y.com>
---
 e2fsck/pass2.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/e2fsck/pass2.c b/e2fsck/pass2.c
index a7d9c47d..8b40e93d 100644
--- a/e2fsck/pass2.c
+++ b/e2fsck/pass2.c
@@ -980,7 +980,8 @@ static int check_dir_block(ext2_filsys fs,
 	 * very large and then the files are deleted. For now, all that is
 	 * needed is to avoid e2fsck filling in these holes as part of
 	 * feature flag. */
-	if (db->blk == 0 && ext2fs_has_feature_largedir(fs->super))
+	if (db->blk == 0 && ext2fs_has_feature_largedir(fs->super) &&
+	    !ext2fs_has_feature_inline_data(fs->super))
 		return 0;

 	if (db->blk == 0 && !inline_data_size) {
-- 
2.14.3