xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ext4: check for out-of-order index extents in ext4_valid_extent_entries()

Browse Source 
commit 8dd27fecede55e8a4e67eef2878040ecad0f0d33 upstream.

After commit 5946d08937 ("ext4: check for overlapping extents in
ext4_valid_extent_entries()"), we can check out the overlapping extent
entry in leaf extent blocks. But the out-of-order extent entry in index
extent blocks could also trigger bad things if the filesystem is
inconsistent. So this patch add a check to figure out the out-of-order
index extents and return error.

Signed-off-by: Zhang Yi <yi.zhang@huawei.com>
Reviewed-by: Theodore Ts'o <tytso@mit.edu>
Link: https://lore.kernel.org/r/20210908120850.4012324-2-yi.zhang@huawei.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Zhang Yi
2021-09-08 20:08:48 +08:00
committed by Greg Kroah-Hartman
parent 1d4b1c4e8b
commit 76366c024f
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
fs/ext4/extents.c
View File

@@ -369,6 +369,9 @@ static int ext4_valid_extent_entries(struct inode *inode,
ext4_fsblk_t *pblk, int depth) ext4_fsblk_t *pblk, int depth)
{ {
unsigned short entries; unsigned short entries;
ext4_lblk_t lblock = 0;
ext4_lblk_t prev = 0;
if (eh->eh_entries == 0) if (eh->eh_entries == 0)
return 1; return 1;
@@ -377,31 +380,35 @@ static int ext4_valid_extent_entries(struct inode *inode,
if (depth == 0) { if (depth == 0) {
/* leaf entries */ /* leaf entries */
struct ext4_extent *ext = EXT_FIRST_EXTENT(eh); struct ext4_extent *ext = EXT_FIRST_EXTENT(eh);
ext4_lblk_t lblock = 0;
ext4_lblk_t prev = 0;
int len = 0;
while (entries) { while (entries) {
if (!ext4_valid_extent(inode, ext)) if (!ext4_valid_extent(inode, ext))
return 0; return 0;
/* Check for overlapping extents */ /* Check for overlapping extents */
lblock = le32_to_cpu(ext->ee_block); lblock = le32_to_cpu(ext->ee_block);
len = ext4_ext_get_actual_len(ext);
if ((lblock <= prev) && prev) { if ((lblock <= prev) && prev) {
*pblk = ext4_ext_pblock(ext); *pblk = ext4_ext_pblock(ext);
return 0; return 0;
} }
prev = lblock + ext4_ext_get_actual_len(ext) - 1;
ext++; ext++;
entries--; entries--;
prev = lblock + len - 1;
} }
} else { } else {
struct ext4_extent_idx *ext_idx = EXT_FIRST_INDEX(eh); struct ext4_extent_idx *ext_idx = EXT_FIRST_INDEX(eh);
while (entries) { while (entries) {
if (!ext4_valid_extent_idx(inode, ext_idx)) if (!ext4_valid_extent_idx(inode, ext_idx))
return 0; return 0;
/* Check for overlapping index extents */
lblock = le32_to_cpu(ext_idx->ei_block);
if ((lblock <= prev) && prev) {
*pblk = ext4_idx_pblock(ext_idx);
return 0;
}
ext_idx++; ext_idx++;
entries--; entries--;
prev = lblock;
} }
} }
return 1; return 1;