summaryrefslogtreecommitdiffstats
path: root/kernel/sysctl.c
diff options
context:
space:
mode:
authorEric Dumazet <edumazet@google.com>2017-01-25 18:20:55 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2017-01-26 09:21:24 -0800
commitff9f8a7cf935468a94d9927c68b00daae701667e (patch)
tree39306aeb2daf7bb000894464811abbef2028fdfe /kernel/sysctl.c
parent928d336a93534df66c0448db61cc4d22705e5b9e (diff)
downloadlinux-stable-ff9f8a7cf935468a94d9927c68b00daae701667e.tar.gz
linux-stable-ff9f8a7cf935468a94d9927c68b00daae701667e.tar.bz2
linux-stable-ff9f8a7cf935468a94d9927c68b00daae701667e.zip
sysctl: fix proc_doulongvec_ms_jiffies_minmax()
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> Cc: stable@vger.kernel.org Signed-off-by: Linus Torvalds <torvalds@linux-foundation.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 8dbaec0e4f7f..1aea594a54db 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -2475,6 +2475,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;