From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1031587AbdDTNR0 (ORCPT ); Thu, 20 Apr 2017 09:17:26 -0400 Received: from terminus.zytor.com ([65.50.211.136]:47149 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S945679AbdDTNRS (ORCPT ); Thu, 20 Apr 2017 09:17:18 -0400 Date: Thu, 20 Apr 2017 06:14:58 -0700 From: tip-bot for Myungho Jung Message-ID: Cc: linux-kernel@vger.kernel.org, tglx@linutronix.de, hpa@zytor.com, mingo@kernel.org, mhjungk@gmail.com Reply-To: tglx@linutronix.de, linux-kernel@vger.kernel.org, mhjungk@gmail.com, mingo@kernel.org, hpa@zytor.com In-Reply-To: <1492640690-3550-1-git-send-email-mhjungk@gmail.com> References: <1492640690-3550-1-git-send-email-mhjungk@gmail.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:timers/core] timer/sysclt: Restrict timer migration sysctl values to 0 and 1 Git-Commit-ID: b94bf594cf8ed67cdd0439e70fa939783471597a X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: b94bf594cf8ed67cdd0439e70fa939783471597a Gitweb: http://git.kernel.org/tip/b94bf594cf8ed67cdd0439e70fa939783471597a Author: Myungho Jung AuthorDate: Wed, 19 Apr 2017 15:24:50 -0700 Committer: Thomas Gleixner CommitDate: Thu, 20 Apr 2017 14:56:59 +0200 timer/sysclt: Restrict timer migration sysctl values to 0 and 1 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 Link: http://lkml.kernel.org/r/1492640690-3550-1-git-send-email-mhjungk@gmail.com Signed-off-by: Thomas Gleixner --- kernel/sysctl.c | 2 ++ kernel/time/timer.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/kernel/sysctl.c b/kernel/sysctl.c index acf0a5a..0863769 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -1176,6 +1176,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 1dc0256..cc6b6bd 100644 --- a/kernel/time/timer.c +++ b/kernel/time/timer.c @@ -241,7 +241,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);