Skip to content

Commit 823c84e

Browse files
committed
ext4: update orig_path in ext4_find_extent()
JIRA: https://issues.redhat.com/browse/RHEL-64615 CVE: CVE-2024-49881 In ext4_find_extent(), if the path is not big enough, we free it and set *orig_path to NULL. But after reallocating and successfully initializing the path, we don't update *orig_path, in which case the caller gets a valid path but a NULL ppath, and this may cause a NULL pointer dereference or a path memory leak. For example: ext4_split_extent path = *ppath = 2000 ext4_find_extent if (depth > path[0].p_maxdepth) kfree(path = 2000); *orig_path = path = NULL; path = kcalloc() = 3000 ext4_split_extent_at(*ppath = NULL) path = *ppath; ex = path[depth].p_ext; // NULL pointer dereference! ================================================================== BUG: kernel NULL pointer dereference, address: 0000000000000010 CPU: 6 UID: 0 PID: 576 Comm: fsstress Not tainted 6.11.0-rc2-dirty #847 RIP: 0010:ext4_split_extent_at+0x6d/0x560 Call Trace: <TASK> ext4_split_extent.isra.0+0xcb/0x1b0 ext4_ext_convert_to_initialized+0x168/0x6c0 ext4_ext_handle_unwritten_extents+0x325/0x4d0 ext4_ext_map_blocks+0x520/0xdb0 ext4_map_blocks+0x2b0/0x690 ext4_iomap_begin+0x20e/0x2c0 [...] ================================================================== Therefore, *orig_path is updated when the extent lookup succeeds, so that the caller can safely use path or *ppath. Fixes: 10809df ("ext4: teach ext4_ext_find_extent() to realloc path if necessary") Cc: stable@kernel.org Signed-off-by: Baokun Li <libaokun1@huawei.com> Reviewed-by: Jan Kara <jack@suse.cz> Link: https://patch.msgid.link/20240822023545.1994557-6-libaokun@huaweicloud.com Signed-off-by: Theodore Ts'o <tytso@mit.edu> (cherry picked from commit 5b4b2dc) Signed-off-by: Pavel Reichl <preichl@redhat.com>
1 parent f27e801 commit 823c84e

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

fs/ext4/extents.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -957,6 +957,8 @@ ext4_find_extent(struct inode *inode, ext4_lblk_t block,
957957

958958
ext4_ext_show_path(inode, path);
959959

960+
if (orig_path)
961+
*orig_path = path;
960962
return path;
961963

962964
err:
@@ -3273,7 +3275,6 @@ static int ext4_split_extent_at(handle_t *handle,
32733275
}
32743276
depth = ext_depth(inode);
32753277
ex = path[depth].p_ext;
3276-
*ppath = path;
32773278

32783279
if (EXT4_EXT_MAY_ZEROOUT & split_flag) {
32793280
if (split_flag & (EXT4_EXT_DATA_VALID1|EXT4_EXT_DATA_VALID2)) {

fs/ext4/move_extent.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ get_ext_path(struct inode *inode, ext4_lblk_t lblock,
3636
*ppath = NULL;
3737
return -ENODATA;
3838
}
39-
*ppath = path;
4039
return 0;
4140
}
4241

0 commit comments

Comments
 (0)