Skip to content

Commit 63bfe84

Browse files
LiBaokun96tytso
authored andcommitted
ext4: add positive int attr pointer to avoid sysfs variables overflow
The following variables controlled by the sysfs interface are of type int and are normally used in the range [0, INT_MAX], but are declared as attr_pointer_ui, and thus may be set to values that exceed INT_MAX and result in overflows to get negative values. err_ratelimit_burst msg_ratelimit_burst warning_ratelimit_burst err_ratelimit_interval_ms msg_ratelimit_interval_ms warning_ratelimit_interval_ms Therefore, we add attr_pointer_pi (aka positive int attr pointer) with a value range of 0-INT_MAX to avoid overflow. Signed-off-by: Baokun Li <libaokun1@huawei.com> Reviewed-by: Jan Kara <jack@suse.cz> Link: https://lore.kernel.org/r/20240319113325.3110393-7-libaokun1@huawei.com Signed-off-by: Theodore Ts'o <tytso@mit.edu>
1 parent b7b2a57 commit 63bfe84

1 file changed

Lines changed: 19 additions & 6 deletions

File tree

fs/ext4/sysfs.c

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ typedef enum {
3232
attr_clusters_in_group,
3333
attr_mb_order,
3434
attr_feature,
35+
attr_pointer_pi,
3536
attr_pointer_ui,
3637
attr_pointer_ul,
3738
attr_pointer_u64,
@@ -180,6 +181,9 @@ static struct ext4_attr ext4_attr_##_name = { \
180181
#define EXT4_RO_ATTR_ES_STRING(_name,_elname,_size) \
181182
EXT4_ATTR_STRING(_name, 0444, _size, ext4_super_block, _elname)
182183

184+
#define EXT4_RW_ATTR_SBI_PI(_name,_elname) \
185+
EXT4_ATTR_OFFSET(_name, 0644, pointer_pi, ext4_sb_info, _elname)
186+
183187
#define EXT4_RW_ATTR_SBI_UI(_name,_elname) \
184188
EXT4_ATTR_OFFSET(_name, 0644, pointer_ui, ext4_sb_info, _elname)
185189

@@ -222,12 +226,12 @@ EXT4_RW_ATTR_SBI_UI(mb_stream_req, s_mb_stream_request);
222226
EXT4_RW_ATTR_SBI_UI(mb_max_linear_groups, s_mb_max_linear_groups);
223227
EXT4_RW_ATTR_SBI_UI(extent_max_zeroout_kb, s_extent_max_zeroout_kb);
224228
EXT4_ATTR(trigger_fs_error, 0200, trigger_test_error);
225-
EXT4_RW_ATTR_SBI_UI(err_ratelimit_interval_ms, s_err_ratelimit_state.interval);
226-
EXT4_RW_ATTR_SBI_UI(err_ratelimit_burst, s_err_ratelimit_state.burst);
227-
EXT4_RW_ATTR_SBI_UI(warning_ratelimit_interval_ms, s_warning_ratelimit_state.interval);
228-
EXT4_RW_ATTR_SBI_UI(warning_ratelimit_burst, s_warning_ratelimit_state.burst);
229-
EXT4_RW_ATTR_SBI_UI(msg_ratelimit_interval_ms, s_msg_ratelimit_state.interval);
230-
EXT4_RW_ATTR_SBI_UI(msg_ratelimit_burst, s_msg_ratelimit_state.burst);
229+
EXT4_RW_ATTR_SBI_PI(err_ratelimit_interval_ms, s_err_ratelimit_state.interval);
230+
EXT4_RW_ATTR_SBI_PI(err_ratelimit_burst, s_err_ratelimit_state.burst);
231+
EXT4_RW_ATTR_SBI_PI(warning_ratelimit_interval_ms, s_warning_ratelimit_state.interval);
232+
EXT4_RW_ATTR_SBI_PI(warning_ratelimit_burst, s_warning_ratelimit_state.burst);
233+
EXT4_RW_ATTR_SBI_PI(msg_ratelimit_interval_ms, s_msg_ratelimit_state.interval);
234+
EXT4_RW_ATTR_SBI_PI(msg_ratelimit_burst, s_msg_ratelimit_state.burst);
231235
#ifdef CONFIG_EXT4_DEBUG
232236
EXT4_RW_ATTR_SBI_UL(simulate_fail, s_simulate_fail);
233237
#endif
@@ -382,6 +386,7 @@ static ssize_t ext4_generic_attr_show(struct ext4_attr *a,
382386
case attr_inode_readahead:
383387
case attr_clusters_in_group:
384388
case attr_mb_order:
389+
case attr_pointer_pi:
385390
case attr_pointer_ui:
386391
if (a->attr_ptr == ptr_ext4_super_block_offset)
387392
return sysfs_emit(buf, "%u\n", le32_to_cpup(ptr));
@@ -452,6 +457,14 @@ static ssize_t ext4_generic_attr_store(struct ext4_attr *a,
452457
return 0;
453458

454459
switch (a->attr_id) {
460+
case attr_pointer_pi:
461+
ret = kstrtouint(skip_spaces(buf), 0, &t);
462+
if (ret)
463+
return ret;
464+
if ((int)t < 0)
465+
return -EINVAL;
466+
*((unsigned int *) ptr) = t;
467+
return len;
455468
case attr_pointer_ui:
456469
ret = kstrtouint(skip_spaces(buf), 0, &t);
457470
if (ret)

0 commit comments

Comments
 (0)