Skip to content

Commit bcbda81

Browse files
Chen Juntorvalds
Chen Jun
authored andcommitted
mm: fix uninitialized use in overcommit_policy_handler
We get an unexpected value of /proc/sys/vm/overcommit_memory after running the following program: int main() { int fd = open("/proc/sys/vm/overcommit_memory", O_RDWR); write(fd, "1", 1); write(fd, "2", 1); close(fd); } write(fd, "2", 1) will pass *ppos = 1 to proc_dointvec_minmax. proc_dointvec_minmax will return 0 without setting new_policy. t.data = &new_policy; ret = proc_dointvec_minmax(&t, write, buffer, lenp, ppos) -->do_proc_dointvec -->__do_proc_dointvec if (write) { if (proc_first_pos_non_zero_ignore(ppos, table)) goto out; sysctl_overcommit_memory = new_policy; so sysctl_overcommit_memory will be set to an uninitialized value. Check whether new_policy has been changed by proc_dointvec_minmax. Link: https://lkml.kernel.org/r/[email protected] Fixes: 56f3547 ("mm: adjust vm_committed_as_batch according to vm overcommit policy") Signed-off-by: Chen Jun <[email protected]> Acked-by: Michal Hocko <[email protected]> Reviewed-by: Feng Tang <[email protected]> Reviewed-by: Kefeng Wang <[email protected]> Cc: Rui Xiang <[email protected]> Cc: <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent 5c91c0e commit bcbda81

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

mm/util.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -787,7 +787,7 @@ int overcommit_policy_handler(struct ctl_table *table, int write, void *buffer,
787787
size_t *lenp, loff_t *ppos)
788788
{
789789
struct ctl_table t;
790-
int new_policy;
790+
int new_policy = -1;
791791
int ret;
792792

793793
/*
@@ -805,7 +805,7 @@ int overcommit_policy_handler(struct ctl_table *table, int write, void *buffer,
805805
t = *table;
806806
t.data = &new_policy;
807807
ret = proc_dointvec_minmax(&t, write, buffer, lenp, ppos);
808-
if (ret)
808+
if (ret || new_policy == -1)
809809
return ret;
810810

811811
mm_compute_batch(new_policy);

0 commit comments

Comments
 (0)