summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorEric Dumazet <edumazet@google.com>2017-01-25 18:20:55 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-02-01 08:30:52 +0100
commitd1b232c2ce53d35dfb9c9e7447eeef42cea20e42 (patch)
tree911d7d342183753c785f282ab218c41bd15bc432 /kernel
parentf11e8bf8e99bf3f7364135a0d15549586d6c6933 (diff)
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')
-rw-r--r--kernel/sysctl.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 999e025bf68e..2f0d157258a2 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -2414,6 +2414,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;