Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ext4: fix BUG_ON() when directory entry has invalid rec_len

The rec_len field in the directory entry has to be a multiple of 4. A
corrupted filesystem image can be used to hit a BUG() in
ext4_rec_len_to_disk(), called from make_indexed_dir().

------------[ cut here ]------------
kernel BUG at fs/ext4/ext4.h:2413!
...
RIP: 0010:make_indexed_dir+0x53f/0x5f0
...
Call Trace:
<TASK>
? add_dirent_to_buf+0x1b2/0x200
ext4_add_entry+0x36e/0x480
ext4_add_nondir+0x2b/0xc0
ext4_create+0x163/0x200
path_openat+0x635/0xe90
do_filp_open+0xb4/0x160
? __create_object.isra.0+0x1de/0x3b0
? _raw_spin_unlock+0x12/0x30
do_sys_openat2+0x91/0x150
__x64_sys_open+0x6c/0xa0
do_syscall_64+0x3c/0x80
entry_SYSCALL_64_after_hwframe+0x46/0xb0

The fix simply adds a call to ext4_check_dir_entry() to validate the
directory entry, returning -EFSCORRUPTED if the entry is invalid.

CC: stable@kernel.org
Link: https://bugzilla.kernel.org/show_bug.cgi?id=216540
Signed-off-by: Luís Henriques <lhenriques@suse.de>
Link: https://lore.kernel.org/r/20221012131330.32456-1-lhenriques@suse.de
Signed-off-by: Theodore Ts'o <tytso@mit.edu>

authored by

Luís Henriques and committed by
Theodore Ts'o
17a0bc9b 9a8c5b0d

+9 -1
+9 -1
fs/ext4/namei.c
··· 2259 2259 memset(de, 0, len); /* wipe old data */ 2260 2260 de = (struct ext4_dir_entry_2 *) data2; 2261 2261 top = data2 + len; 2262 - while ((char *)(de2 = ext4_next_entry(de, blocksize)) < top) 2262 + while ((char *)(de2 = ext4_next_entry(de, blocksize)) < top) { 2263 + if (ext4_check_dir_entry(dir, NULL, de, bh2, data2, len, 2264 + (data2 + (blocksize - csum_size) - 2265 + (char *) de))) { 2266 + brelse(bh2); 2267 + brelse(bh); 2268 + return -EFSCORRUPTED; 2269 + } 2263 2270 de = de2; 2271 + } 2264 2272 de->rec_len = ext4_rec_len_to_disk(data2 + (blocksize - csum_size) - 2265 2273 (char *) de, blocksize); 2266 2274