Skip to content

Commit fd63738

Browse files
committed
Merge: CVE-2024-49884: ext4: fix slab-use-after-free in ext4_split_extent_at()
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/5567 JIRA: https://issues.redhat.com/browse/RHEL-64147 CVE: CVE-2024-49884 ``` ext4: fix slab-use-after-free in ext4_split_extent_at() We hit the following use-after-free: ================================================================== BUG: KASAN: slab-use-after-free in ext4_split_extent_at+0xba8/0xcc0 Read of size 2 at addr ffff88810548ed08 by task kworker/u20:0/40 CPU: 0 PID: 40 Comm: kworker/u20:0 Not tainted 6.9.0-dirty #724 Call Trace: <TASK> kasan_report+0x93/0xc0 ext4_split_extent_at+0xba8/0xcc0 ext4_split_extent.isra.0+0x18f/0x500 ext4_split_convert_extents+0x275/0x750 ext4_ext_handle_unwritten_extents+0x73e/0x1580 ext4_ext_map_blocks+0xe20/0x2dc0 ext4_map_blocks+0x724/0x1700 ext4_do_writepages+0x12d6/0x2a70 [...] Allocated by task 40: __kmalloc_noprof+0x1ac/0x480 ext4_find_extent+0xf3b/0x1e70 ext4_ext_map_blocks+0x188/0x2dc0 ext4_map_blocks+0x724/0x1700 ext4_do_writepages+0x12d6/0x2a70 [...] Freed by task 40: kfree+0xf1/0x2b0 ext4_find_extent+0xa71/0x1e70 ext4_ext_insert_extent+0xa22/0x3260 ext4_split_extent_at+0x3ef/0xcc0 ext4_split_extent.isra.0+0x18f/0x500 ext4_split_convert_extents+0x275/0x750 ext4_ext_handle_unwritten_extents+0x73e/0x1580 ext4_ext_map_blocks+0xe20/0x2dc0 ext4_map_blocks+0x724/0x1700 ext4_do_writepages+0x12d6/0x2a70 [...] ================================================================== The flow of issue triggering is as follows: ext4_split_extent_at path = *ppath ext4_ext_insert_extent(ppath) ext4_ext_create_new_leaf(ppath) ext4_find_extent(orig_path) path = *orig_path read_extent_tree_block // return -ENOMEM or -EIO ext4_free_ext_path(path) kfree(path) *orig_path = NULL a. If err is -ENOMEM: ext4_ext_dirty(path + path->p_depth) // path use-after-free !!! b. If err is -EIO and we have EXT_DEBUG defined: ext4_ext_show_leaf(path) eh = path[depth].p_hdr // path also use-after-free !!! So when trying to zeroout or fix the extent length, call ext4_find_extent() to update the path. In addition we use *ppath directly as an ext4_ext_show_leaf() input to avoid possible use-after-free when EXT_DEBUG is defined, and to avoid unnecessary path updates. Fixes: dfe5080 ("ext4: drop EXT4_EX_NOFREE_ON_ERR from rest of extents handling code") Cc: stable@kernel.org Signed-off-by: Baokun Li <libaokun1@huawei.com> Reviewed-by: Jan Kara <jack@suse.cz> Reviewed-by: Ojaswin Mujoo <ojaswin@linux.ibm.com> Tested-by: Ojaswin Mujoo <ojaswin@linux.ibm.com> Link: https://patch.msgid.link/20240822023545.1994557-4-libaokun@huaweicloud.com Signed-off-by: Theodore Ts'o <tytso@mit.edu> (cherry picked from commit c26ab35) ``` Signed-off-by: CKI Backport Bot <cki-ci-bot+cki-gitlab-backport-bot@redhat.com> --- <small>Created 2024-10-22 16:18 UTC by backporter - [KWF FAQ](https://red.ht/kernel_workflow_doc) - [Slack #team-kernel-workflow](https://redhat-internal.slack.com/archives/C04LRUPMJQ5) - [Source](https://gitlab.com/cki-project/kernel-workflow/-/blob/main/webhook/utils/backporter.py) - [Documentation](https://gitlab.com/cki-project/kernel-workflow/-/blob/main/docs/README.backporter.md) - [Report an issue](https://gitlab.com/cki-project/kernel-workflow/-/issues/new?issue%5Btitle%5D=backporter%20webhook%20issue)</small> Approved-by: Brian Foster <bfoster@redhat.com> Approved-by: Chris von Recklinghausen <crecklin@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: Rado Vrbovsky <rvrbovsk@redhat.com>
2 parents 189d42b + 4a224c1 commit fd63738

File tree

1 file changed

+20
-1
lines changed

1 file changed

+20
-1
lines changed

fs/ext4/extents.c

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3256,6 +3256,25 @@ static int ext4_split_extent_at(handle_t *handle,
32563256
if (err != -ENOSPC && err != -EDQUOT && err != -ENOMEM)
32573257
goto out;
32583258

3259+
/*
3260+
* Update path is required because previous ext4_ext_insert_extent()
3261+
* may have freed or reallocated the path. Using EXT4_EX_NOFAIL
3262+
* guarantees that ext4_find_extent() will not return -ENOMEM,
3263+
* otherwise -ENOMEM will cause a retry in do_writepages(), and a
3264+
* WARN_ON may be triggered in ext4_da_update_reserve_space() due to
3265+
* an incorrect ee_len causing the i_reserved_data_blocks exception.
3266+
*/
3267+
path = ext4_find_extent(inode, ee_block, ppath,
3268+
flags | EXT4_EX_NOFAIL);
3269+
if (IS_ERR(path)) {
3270+
EXT4_ERROR_INODE(inode, "Failed split extent on %u, err %ld",
3271+
split, PTR_ERR(path));
3272+
return PTR_ERR(path);
3273+
}
3274+
depth = ext_depth(inode);
3275+
ex = path[depth].p_ext;
3276+
*ppath = path;
3277+
32593278
if (EXT4_EXT_MAY_ZEROOUT & split_flag) {
32603279
if (split_flag & (EXT4_EXT_DATA_VALID1|EXT4_EXT_DATA_VALID2)) {
32613280
if (split_flag & EXT4_EXT_DATA_VALID1) {
@@ -3308,7 +3327,7 @@ static int ext4_split_extent_at(handle_t *handle,
33083327
ext4_ext_dirty(handle, inode, path + path->p_depth);
33093328
return err;
33103329
out:
3311-
ext4_ext_show_leaf(inode, path);
3330+
ext4_ext_show_leaf(inode, *ppath);
33123331
return err;
33133332
}
33143333

0 commit comments

Comments
 (0)