From 27b4513d28899fedfc8269a5aadd1fccb22885c0 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 24 Jun 2024 17:01:20 +0200 Subject: [PATCH] 6.6-stable patches added patches: ext4-avoid-overflow-when-setting-values-via-sysfs.patch ext4-fix-slab-out-of-bounds-in-ext4_mb_find_good_group_avg_frag_lists.patch --- ...erflow-when-setting-values-via-sysfs.patch | 74 +++++++++ ...t4_mb_find_good_group_avg_frag_lists.patch | 140 ++++++++++++++++++ queue-6.6/series | 2 + 3 files changed, 216 insertions(+) create mode 100644 queue-6.6/ext4-avoid-overflow-when-setting-values-via-sysfs.patch create mode 100644 queue-6.6/ext4-fix-slab-out-of-bounds-in-ext4_mb_find_good_group_avg_frag_lists.patch diff --git a/queue-6.6/ext4-avoid-overflow-when-setting-values-via-sysfs.patch b/queue-6.6/ext4-avoid-overflow-when-setting-values-via-sysfs.patch new file mode 100644 index 00000000000..152fc4a828d --- /dev/null +++ b/queue-6.6/ext4-avoid-overflow-when-setting-values-via-sysfs.patch @@ -0,0 +1,74 @@ +From 9e8e819f8f272c4e5dcd0bd6c7450e36481ed139 Mon Sep 17 00:00:00 2001 +From: Baokun Li +Date: Tue, 19 Mar 2024 19:33:17 +0800 +Subject: ext4: avoid overflow when setting values via sysfs + +From: Baokun Li + +commit 9e8e819f8f272c4e5dcd0bd6c7450e36481ed139 upstream. + +When setting values of type unsigned int through sysfs, we use kstrtoul() +to parse it and then truncate part of it as the final set value, when the +set value is greater than UINT_MAX, the set value will not match what we +see because of the truncation. As follows: + + $ echo 4294967296 > /sys/fs/ext4/sda/mb_max_linear_groups + $ cat /sys/fs/ext4/sda/mb_max_linear_groups + 0 + +So we use kstrtouint() to parse the attr_pointer_ui type to avoid the +inconsistency described above. In addition, a judgment is added to avoid +setting s_resv_clusters less than 0. + +Signed-off-by: Baokun Li +Reviewed-by: Jan Kara +Link: https://lore.kernel.org/r/20240319113325.3110393-2-libaokun1@huawei.com +Signed-off-by: Theodore Ts'o +Signed-off-by: Greg Kroah-Hartman +--- + fs/ext4/sysfs.c | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +--- a/fs/ext4/sysfs.c ++++ b/fs/ext4/sysfs.c +@@ -104,7 +104,7 @@ static ssize_t reserved_clusters_store(s + int ret; + + ret = kstrtoull(skip_spaces(buf), 0, &val); +- if (ret || val >= clusters) ++ if (ret || val >= clusters || (s64)val < 0) + return -EINVAL; + + atomic64_set(&sbi->s_resv_clusters, val); +@@ -451,7 +451,8 @@ static ssize_t ext4_attr_store(struct ko + s_kobj); + struct ext4_attr *a = container_of(attr, struct ext4_attr, attr); + void *ptr = calc_ptr(a, sbi); +- unsigned long t; ++ unsigned int t; ++ unsigned long lt; + int ret; + + switch (a->attr_id) { +@@ -460,7 +461,7 @@ static ssize_t ext4_attr_store(struct ko + case attr_pointer_ui: + if (!ptr) + return 0; +- ret = kstrtoul(skip_spaces(buf), 0, &t); ++ ret = kstrtouint(skip_spaces(buf), 0, &t); + if (ret) + return ret; + if (a->attr_ptr == ptr_ext4_super_block_offset) +@@ -471,10 +472,10 @@ static ssize_t ext4_attr_store(struct ko + case attr_pointer_ul: + if (!ptr) + return 0; +- ret = kstrtoul(skip_spaces(buf), 0, &t); ++ ret = kstrtoul(skip_spaces(buf), 0, <); + if (ret) + return ret; +- *((unsigned long *) ptr) = t; ++ *((unsigned long *) ptr) = lt; + return len; + case attr_inode_readahead: + return inode_readahead_blks_store(sbi, buf, len); diff --git a/queue-6.6/ext4-fix-slab-out-of-bounds-in-ext4_mb_find_good_group_avg_frag_lists.patch b/queue-6.6/ext4-fix-slab-out-of-bounds-in-ext4_mb_find_good_group_avg_frag_lists.patch new file mode 100644 index 00000000000..3bb8c9c94a4 --- /dev/null +++ b/queue-6.6/ext4-fix-slab-out-of-bounds-in-ext4_mb_find_good_group_avg_frag_lists.patch @@ -0,0 +1,140 @@ +From 13df4d44a3aaabe61cd01d277b6ee23ead2a5206 Mon Sep 17 00:00:00 2001 +From: Baokun Li +Date: Tue, 19 Mar 2024 19:33:20 +0800 +Subject: ext4: fix slab-out-of-bounds in ext4_mb_find_good_group_avg_frag_lists() + +From: Baokun Li + +commit 13df4d44a3aaabe61cd01d277b6ee23ead2a5206 upstream. + +We can trigger a slab-out-of-bounds with the following commands: + + mkfs.ext4 -F /dev/$disk 10G + mount /dev/$disk /tmp/test + echo 2147483647 > /sys/fs/ext4/$disk/mb_group_prealloc + echo test > /tmp/test/file && sync + +================================================================== +BUG: KASAN: slab-out-of-bounds in ext4_mb_find_good_group_avg_frag_lists+0x8a/0x200 [ext4] +Read of size 8 at addr ffff888121b9d0f0 by task kworker/u2:0/11 +CPU: 0 PID: 11 Comm: kworker/u2:0 Tainted: GL 6.7.0-next-20240118 #521 +Call Trace: + dump_stack_lvl+0x2c/0x50 + kasan_report+0xb6/0xf0 + ext4_mb_find_good_group_avg_frag_lists+0x8a/0x200 [ext4] + ext4_mb_regular_allocator+0x19e9/0x2370 [ext4] + ext4_mb_new_blocks+0x88a/0x1370 [ext4] + ext4_ext_map_blocks+0x14f7/0x2390 [ext4] + ext4_map_blocks+0x569/0xea0 [ext4] + ext4_do_writepages+0x10f6/0x1bc0 [ext4] +[...] +================================================================== + +The flow of issue triggering is as follows: + +// Set s_mb_group_prealloc to 2147483647 via sysfs +ext4_mb_new_blocks + ext4_mb_normalize_request + ext4_mb_normalize_group_request + ac->ac_g_ex.fe_len = EXT4_SB(sb)->s_mb_group_prealloc + ext4_mb_regular_allocator + ext4_mb_choose_next_group + ext4_mb_choose_next_group_best_avail + mb_avg_fragment_size_order + order = fls(len) - 2 = 29 + ext4_mb_find_good_group_avg_frag_lists + frag_list = &sbi->s_mb_avg_fragment_size[order] + if (list_empty(frag_list)) // Trigger SOOB! + +At 4k block size, the length of the s_mb_avg_fragment_size list is 14, +but an oversized s_mb_group_prealloc is set, causing slab-out-of-bounds +to be triggered by an attempt to access an element at index 29. + +Add a new attr_id attr_clusters_in_group with values in the range +[0, sbi->s_clusters_per_group] and declare mb_group_prealloc as +that type to fix the issue. In addition avoid returning an order +from mb_avg_fragment_size_order() greater than MB_NUM_ORDERS(sb) +and reduce some useless loops. + +Fixes: 7e170922f06b ("ext4: Add allocation criteria 1.5 (CR1_5)") +CC: stable@vger.kernel.org +Signed-off-by: Baokun Li +Reviewed-by: Jan Kara +Reviewed-by: Ojaswin Mujoo +Link: https://lore.kernel.org/r/20240319113325.3110393-5-libaokun1@huawei.com +Signed-off-by: Theodore Ts'o +Signed-off-by: Greg Kroah-Hartman +--- + fs/ext4/mballoc.c | 4 ++++ + fs/ext4/sysfs.c | 13 ++++++++++++- + 2 files changed, 16 insertions(+), 1 deletion(-) + +--- a/fs/ext4/mballoc.c ++++ b/fs/ext4/mballoc.c +@@ -831,6 +831,8 @@ static int mb_avg_fragment_size_order(st + return 0; + if (order == MB_NUM_ORDERS(sb)) + order--; ++ if (WARN_ON_ONCE(order > MB_NUM_ORDERS(sb))) ++ order = MB_NUM_ORDERS(sb) - 1; + return order; + } + +@@ -1008,6 +1010,8 @@ static void ext4_mb_choose_next_group_be + * goal length. + */ + order = fls(ac->ac_g_ex.fe_len) - 1; ++ if (WARN_ON_ONCE(order - 1 > MB_NUM_ORDERS(ac->ac_sb))) ++ order = MB_NUM_ORDERS(ac->ac_sb); + min_order = order - sbi->s_mb_best_avail_max_trim_order; + if (min_order < 0) + min_order = 0; +--- a/fs/ext4/sysfs.c ++++ b/fs/ext4/sysfs.c +@@ -29,6 +29,7 @@ typedef enum { + attr_trigger_test_error, + attr_first_error_time, + attr_last_error_time, ++ attr_clusters_in_group, + attr_feature, + attr_pointer_ui, + attr_pointer_ul, +@@ -207,13 +208,14 @@ EXT4_ATTR_FUNC(sra_exceeded_retry_limit, + + EXT4_ATTR_OFFSET(inode_readahead_blks, 0644, inode_readahead, + ext4_sb_info, s_inode_readahead_blks); ++EXT4_ATTR_OFFSET(mb_group_prealloc, 0644, clusters_in_group, ++ ext4_sb_info, s_mb_group_prealloc); + EXT4_RW_ATTR_SBI_UI(inode_goal, s_inode_goal); + EXT4_RW_ATTR_SBI_UI(mb_stats, s_mb_stats); + EXT4_RW_ATTR_SBI_UI(mb_max_to_scan, s_mb_max_to_scan); + EXT4_RW_ATTR_SBI_UI(mb_min_to_scan, s_mb_min_to_scan); + EXT4_RW_ATTR_SBI_UI(mb_order2_req, s_mb_order2_reqs); + EXT4_RW_ATTR_SBI_UI(mb_stream_req, s_mb_stream_request); +-EXT4_RW_ATTR_SBI_UI(mb_group_prealloc, s_mb_group_prealloc); + EXT4_RW_ATTR_SBI_UI(mb_max_linear_groups, s_mb_max_linear_groups); + EXT4_RW_ATTR_SBI_UI(extent_max_zeroout_kb, s_extent_max_zeroout_kb); + EXT4_ATTR(trigger_fs_error, 0200, trigger_test_error); +@@ -392,6 +394,7 @@ static ssize_t ext4_attr_show(struct kob + (unsigned long long) + percpu_counter_sum(&sbi->s_sra_exceeded_retry_limit)); + case attr_inode_readahead: ++ case attr_clusters_in_group: + case attr_pointer_ui: + if (!ptr) + return 0; +@@ -469,6 +472,14 @@ static ssize_t ext4_attr_store(struct ko + else + *((unsigned int *) ptr) = t; + return len; ++ case attr_clusters_in_group: ++ ret = kstrtouint(skip_spaces(buf), 0, &t); ++ if (ret) ++ return ret; ++ if (t > sbi->s_clusters_per_group) ++ return -EINVAL; ++ *((unsigned int *) ptr) = t; ++ return len; + case attr_pointer_ul: + if (!ptr) + return 0; diff --git a/queue-6.6/series b/queue-6.6/series index 5c1eb97b6e6..bd6689d79d8 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -133,3 +133,5 @@ rdma-mlx5-add-check-for-srq-max_sge-attribute.patch rdma-mana_ib-ignore-optional-access-flags-for-mrs.patch acpi-ec-evaluate-orphan-_reg-under-ec-device.patch arm64-defconfig-enable-the-vf610-gpio-driver.patch +ext4-avoid-overflow-when-setting-values-via-sysfs.patch +ext4-fix-slab-out-of-bounds-in-ext4_mb_find_good_group_avg_frag_lists.patch -- 2.47.3