diff options
| author | Eric Dumazet <edumazet@google.com> | 2017-01-25 18:20:55 -0800 |
|---|---|---|
| committer | Mister Oyster <oysterized@gmail.com> | 2017-07-04 11:51:29 +0200 |
| commit | 197cade90755fdffe6c1eca24c8c84bfd596dcf6 (patch) | |
| tree | 9742621638ebfc3942d5c55c5b8bb81148d21052 /kernel/sysctl.c | |
| parent | 5ac36fdbec9d32d38f752b140b106f95da7c9f6a (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: Willy Tarreau <w@1wt.eu>
Diffstat (limited to 'kernel/sysctl.c')
| -rw-r--r-- | kernel/sysctl.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index c628b49a9..0b6678a6b 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -2306,6 +2306,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; |