summaryrefslogtreecommitdiff
path: root/kernel/sysctl.c
diff options
context:
space:
mode:
authorEric Dumazet <edumazet@google.com>2017-01-26 02:20:55 (GMT)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-02-01 07:33:05 (GMT)
commit03707d6c36f9c7355c22e43039c09804e96a02b6 (patch)
treeff5d38dd47b2b479fee6c5a1394537b5dad7e0f6 /kernel/sysctl.c
parentc7556867782ee8ae0383a1e99df09222f1f01332 (diff)
downloadlinux-03707d6c36f9c7355c22e43039c09804e96a02b6.tar.xz
sysctl: fix proc_doulongvec_ms_jiffies_minmax()
commit ff9f8a7cf935468a94d9927c68b00daae701667e upstream. We perform the conversion between kernel jiffies and ms only when exporting kernel value to user space. We need to do the opposite operation when value is written by user. Only matters when HZ != 1000 Signed-off-by: Eric Dumazet <edumazet@google.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel/sysctl.c')
-rw-r--r--kernel/sysctl.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 706309f..c1095cd 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -2487,6 +2487,7 @@ static int __do_proc_doulongvec_minmax(void *data, struct ctl_table *table, int
break;
if (neg)
continue;
+ val = convmul * val / convdiv;
if ((min && val < *min) || (max && val > *max))
continue;
*i = val;