Skip to content

Commit b9cebd8

Browse files
LiBaokun96mehmetb0
authored andcommitted
ext4: update orig_path in ext4_find_extent()
BugLink: https://bugs.launchpad.net/bugs/2086242 commit 5b4b2dc upstream. 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: [email protected] Signed-off-by: Baokun Li <[email protected]> Reviewed-by: Jan Kara <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Theodore Ts'o <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]> Signed-off-by: Koichiro Den <[email protected]> Signed-off-by: Roxana Nicolescu <[email protected]>
1 parent 615dc08 commit b9cebd8

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
@@ -950,6 +950,8 @@ ext4_find_extent(struct inode *inode, ext4_lblk_t block,
950950

951951
ext4_ext_show_path(inode, path);
952952

953+
if (orig_path)
954+
*orig_path = path;
953955
return path;
954956

955957
err:
@@ -3250,7 +3252,6 @@ static int ext4_split_extent_at(handle_t *handle,
32503252
}
32513253
depth = ext_depth(inode);
32523254
ex = path[depth].p_ext;
3253-
*ppath = path;
32543255

32553256
if (EXT4_EXT_MAY_ZEROOUT & split_flag) {
32563257
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)