Skip to content

Commit 9061f0d

Browse files
LiBaokun96intel-lab-lkp
authored andcommitted
ext4: add positive int attr pointer to avoid sysfs variables overflow
We can easily trigger a BUG_ON by using the following commands: mount /dev/$disk /tmp/test echo 2147483650 > /sys/fs/ext4/$disk/mb_group_prealloc echo test > /tmp/test/file && sync ================================================================== kernel BUG at fs/ext4/mballoc.c:2029! invalid opcode: 0000 [#1] PREEMPT SMP PTI CPU: 3 PID: 320 Comm: kworker/u36:1 Not tainted 6.8.0-rc1 torvalds#462 RIP: 0010:mb_mark_used+0x358/0x370 [...] Call Trace: ext4_mb_use_best_found+0x56/0x140 ext4_mb_complex_scan_group+0x196/0x2f0 ext4_mb_regular_allocator+0xa92/0xf00 ext4_mb_new_blocks+0x302/0xbc0 ext4_ext_map_blocks+0x95a/0xef0 ext4_map_blocks+0x2b1/0x680 ext4_do_writepages+0x733/0xbd0 [...] ================================================================== In ext4_mb_normalize_group_request(): ac->ac_g_ex.fe_len = EXT4_SB(sb)->s_mb_group_prealloc; Here fe_len is of type int, but s_mb_group_prealloc is of type unsigned int, so setting s_mb_group_prealloc to 2147483650 overflows fe_len to a negative number, which ultimately triggers a BUG_ON() in mb_mark_used(). Therefore, we add attr_pointer_pi (aka positive int attr pointer) with a value range of 0-INT_MAX to avoid the above problem. In addition to the mb_group_prealloc sysfs interface, the following interfaces also have uint to int conversions that result in overflows, and are also fixed. err_ratelimit_burst msg_ratelimit_burst warning_ratelimit_burst err_ratelimit_interval_ms msg_ratelimit_interval_ms warning_ratelimit_interval_ms mb_best_avail_max_trim_order CC: stable@vger.kernel.org Signed-off-by: Baokun Li <libaokun1@huawei.com>
1 parent 1a08ae1 commit 9061f0d

File tree

1 file changed

+17
-8
lines changed

1 file changed

+17
-8
lines changed

fs/ext4/sysfs.c

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ typedef enum {
3030
attr_first_error_time,
3131
attr_last_error_time,
3232
attr_feature,
33+
attr_pointer_pi,
3334
attr_pointer_ui,
3435
attr_pointer_ul,
3536
attr_pointer_u64,
@@ -178,6 +179,9 @@ static struct ext4_attr ext4_attr_##_name = { \
178179
#define EXT4_RO_ATTR_ES_STRING(_name,_elname,_size) \
179180
EXT4_ATTR_STRING(_name, 0444, _size, ext4_super_block, _elname)
180181

182+
#define EXT4_RW_ATTR_SBI_PI(_name,_elname) \
183+
EXT4_ATTR_OFFSET(_name, 0644, pointer_pi, ext4_sb_info, _elname)
184+
181185
#define EXT4_RW_ATTR_SBI_UI(_name,_elname) \
182186
EXT4_ATTR_OFFSET(_name, 0644, pointer_ui, ext4_sb_info, _elname)
183187

@@ -213,17 +217,17 @@ EXT4_RW_ATTR_SBI_UI(mb_max_to_scan, s_mb_max_to_scan);
213217
EXT4_RW_ATTR_SBI_UI(mb_min_to_scan, s_mb_min_to_scan);
214218
EXT4_RW_ATTR_SBI_UI(mb_order2_req, s_mb_order2_reqs);
215219
EXT4_RW_ATTR_SBI_UI(mb_stream_req, s_mb_stream_request);
216-
EXT4_RW_ATTR_SBI_UI(mb_group_prealloc, s_mb_group_prealloc);
220+
EXT4_RW_ATTR_SBI_PI(mb_group_prealloc, s_mb_group_prealloc);
217221
EXT4_RW_ATTR_SBI_UI(mb_max_linear_groups, s_mb_max_linear_groups);
218222
EXT4_RW_ATTR_SBI_UI(extent_max_zeroout_kb, s_extent_max_zeroout_kb);
219223
EXT4_ATTR(trigger_fs_error, 0200, trigger_test_error);
220-
EXT4_RW_ATTR_SBI_UI(err_ratelimit_interval_ms, s_err_ratelimit_state.interval);
221-
EXT4_RW_ATTR_SBI_UI(err_ratelimit_burst, s_err_ratelimit_state.burst);
222-
EXT4_RW_ATTR_SBI_UI(warning_ratelimit_interval_ms, s_warning_ratelimit_state.interval);
223-
EXT4_RW_ATTR_SBI_UI(warning_ratelimit_burst, s_warning_ratelimit_state.burst);
224-
EXT4_RW_ATTR_SBI_UI(msg_ratelimit_interval_ms, s_msg_ratelimit_state.interval);
225-
EXT4_RW_ATTR_SBI_UI(msg_ratelimit_burst, s_msg_ratelimit_state.burst);
226-
EXT4_RW_ATTR_SBI_UI(mb_best_avail_max_trim_order, s_mb_best_avail_max_trim_order);
224+
EXT4_RW_ATTR_SBI_PI(err_ratelimit_interval_ms, s_err_ratelimit_state.interval);
225+
EXT4_RW_ATTR_SBI_PI(err_ratelimit_burst, s_err_ratelimit_state.burst);
226+
EXT4_RW_ATTR_SBI_PI(warning_ratelimit_interval_ms, s_warning_ratelimit_state.interval);
227+
EXT4_RW_ATTR_SBI_PI(warning_ratelimit_burst, s_warning_ratelimit_state.burst);
228+
EXT4_RW_ATTR_SBI_PI(msg_ratelimit_interval_ms, s_msg_ratelimit_state.interval);
229+
EXT4_RW_ATTR_SBI_PI(msg_ratelimit_burst, s_msg_ratelimit_state.burst);
230+
EXT4_RW_ATTR_SBI_PI(mb_best_avail_max_trim_order, s_mb_best_avail_max_trim_order);
227231
#ifdef CONFIG_EXT4_DEBUG
228232
EXT4_RW_ATTR_SBI_UL(simulate_fail, s_simulate_fail);
229233
#endif
@@ -376,6 +380,7 @@ static ssize_t ext4_generic_attr_show(struct ext4_attr *a,
376380

377381
switch (a->attr_id) {
378382
case attr_inode_readahead:
383+
case attr_pointer_pi:
379384
case attr_pointer_ui:
380385
if (a->attr_ptr == ptr_ext4_super_block_offset)
381386
return sysfs_emit(buf, "%u\n", le32_to_cpup(ptr));
@@ -448,6 +453,10 @@ static ssize_t ext4_generic_attr_store(struct ext4_attr *a,
448453
return ret;
449454

450455
switch (a->attr_id) {
456+
case attr_pointer_pi:
457+
if ((int)t < 0)
458+
return -EINVAL;
459+
fallthrough;
451460
case attr_pointer_ui:
452461
if (t != (unsigned int)t)
453462
return -EINVAL;

0 commit comments

Comments
 (0)