kernel/sysctl.c: add missing range check in do_proc_dointvec_minmax_conv
Subsystems (2)
PATCH 2/38 kernel/sysctl.c: add missing range check in do_proc_dointvec_minmax_conv
From: Zev Weiss <[email protected]>
Subject: kernel/sysctl.c: add missing range check in do_proc_dointvec_minmax_conv
This bug has apparently existed since the introduction of this function in the pre-git era (4500e91754d3 in Thomas Gleixner's history.git, "[NET]:
Add proc_dointvec_userhz_jiffies, use it for proper handling of neighbour sysctls."). As a minimal fix we can simply duplicate the corresponding check in do_proc_dointvec_conv().
Signed-off-by Zev Weiss <[email protected]>
Cc Brendan Higgins <[email protected]>
Cc Iurii Zaikin <[email protected]>
Cc Kees Cook <[email protected]>
Cc Luis Chamberlain <[email protected]>
Cc <[email protected]> [2.6.2+]
Signed-off-by Andrew Morton <[email protected]>
---
kernel/sysctl.c renamed from kernel/sysctl.c~kernel-sysctlc-add-missing-range-check-in-do_proc_dointvec_minmax_conv +10 -1
@@ -2645,7 +2645,16 @@ static int do_proc_dointvec_minmax_conv( {struct do_proc_dointvec_minmax_conv_param *param = data;if (write) { -int val = *negp ? -*lvalp : *lvalp; +int val; +if (*negp) { +if (*lvalp > (unsigned long )INT_MAX +1 ) +return -EINVAL ; + val = -*lvalp; + }else { +if (*lvalp > (unsigned long )INT_MAX ) +return -EINVAL ; + val = *lvalp; + }if ((param->min && *param->min > val) || (param->max && *param->max < val))return -EINVAL ;
_