summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorMyungho Jung <mhjungk@gmail.com>2017-04-19 15:24:50 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-10-05 09:41:47 +0200
commit5e9b526fcc907c17c6d62ce0dc7d044d6613d419 (patch)
tree0150f7cc9a44b90c4bcf45212d07c2d3c86704cc /kernel
parentddf25aea679de86150a34821ed7144d670db2aa9 (diff)
downloadlinux-stable-5e9b526fcc907c17c6d62ce0dc7d044d6613d419.tar.gz
linux-stable-5e9b526fcc907c17c6d62ce0dc7d044d6613d419.tar.bz2
linux-stable-5e9b526fcc907c17c6d62ce0dc7d044d6613d419.zip
timer/sysclt: Restrict timer migration sysctl values to 0 and 1
commit b94bf594cf8ed67cdd0439e70fa939783471597a upstream. timer_migration sysctl acts as a boolean switch, so the allowed values should be restricted to 0 and 1. Add the necessary extra fields to the sysctl table entry to enforce that. [ tglx: Rewrote changelog ] Signed-off-by: Myungho Jung <mhjungk@gmail.com> Link: http://lkml.kernel.org/r/1492640690-3550-1-git-send-email-mhjungk@gmail.com Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Kazuhiro Hayashi <kazuhiro3.hayashi@toshiba.co.jp> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/sysctl.c2
-rw-r--r--kernel/time/timer.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 002ec084124b..17c59e78661b 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -1159,6 +1159,8 @@ static struct ctl_table kern_table[] = {
.maxlen = sizeof(unsigned int),
.mode = 0644,
.proc_handler = timer_migration_handler,
+ .extra1 = &zero,
+ .extra2 = &one,
},
#endif
#ifdef CONFIG_BPF_SYSCALL
diff --git a/kernel/time/timer.c b/kernel/time/timer.c
index bbc5d1114583..125407144c01 100644
--- a/kernel/time/timer.c
+++ b/kernel/time/timer.c
@@ -127,7 +127,7 @@ int timer_migration_handler(struct ctl_table *table, int write,
int ret;
mutex_lock(&mutex);
- ret = proc_dointvec(table, write, buffer, lenp, ppos);
+ ret = proc_dointvec_minmax(table, write, buffer, lenp, ppos);
if (!ret && write)
timers_update_migration(false);
mutex_unlock(&mutex);