Commit c61fad16 authored by Christian Brauner's avatar Christian Brauner Committed by Stefan Bader

sysctl: return -EINVAL if val violates minmax

BugLink: https://bugs.launchpad.net/bugs/1836666

[ Upstream commit e260ad01 ]

Currently when userspace gives us a values that overflow e.g.  file-max
and other callers of __do_proc_doulongvec_minmax() we simply ignore the
new value and leave the current value untouched.

This can be problematic as it gives the illusion that the limit has
indeed be bumped when in fact it failed.  This commit makes sure to
return EINVAL when an overflow is detected.  Please note that this is a
userspace facing change.

Link: http://lkml.kernel.org/r/20190210203943.8227-4-christian@brauner.ioSigned-off-by: default avatarChristian Brauner <christian@brauner.io>
Acked-by: default avatarLuis Chamberlain <mcgrof@kernel.org>
Cc: Kees Cook <keescook@chromium.org>
Cc: Alexey Dobriyan <adobriyan@gmail.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Dominik Brodowski <linux@dominikbrodowski.net>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Joe Lawrence <joe.lawrence@redhat.com>
Cc: Waiman Long <longman@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarKhalid Elmously <khalid.elmously@canonical.com>
Signed-off-by: default avatarKleber Sacilotto de Souza <kleber.souza@canonical.com>
parent d613be83
...@@ -2682,8 +2682,10 @@ static int __do_proc_doulongvec_minmax(void *data, struct ctl_table *table, int ...@@ -2682,8 +2682,10 @@ static int __do_proc_doulongvec_minmax(void *data, struct ctl_table *table, int
if (neg) if (neg)
continue; continue;
val = convmul * val / convdiv; val = convmul * val / convdiv;
if ((min && val < *min) || (max && val > *max)) if ((min && val < *min) || (max && val > *max)) {
continue; err = -EINVAL;
break;
}
*i = val; *i = val;
} else { } else {
val = convdiv * (*i) / convmul; val = convdiv * (*i) / convmul;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment