From: Sasha Levin <levinsasha928@gmail.com>
To: viro@zeniv.linux.org.uk, rostedt@goodmis.org, fweisbec@gmail.com,
mingo@redhat.com, a.p.zijlstra@chello.nl, paulus@samba.org,
acme@ghostprotocols.net, james.l.morris@oracle.com,
ebiederm@xmission.com, akpm@linux-foundation.org,
tglx@linutronix.de
Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-mm@kvack.org, linux-security-module@vger.kernel.org,
Sasha Levin <levinsasha928@gmail.com>
Subject: [PATCH 07/14] watchdog,sysctl: remove proc input checks out of sysctl handlers
Date: Sun, 29 Apr 2012 08:45:30 +0200 [thread overview]
Message-ID: <1335681937-3715-7-git-send-email-levinsasha928@gmail.com> (raw)
In-Reply-To: <1335681937-3715-1-git-send-email-levinsasha928@gmail.com>
Simplify sysctl handler by removing user input checks and using the callback
provided by the sysctl table.
Signed-off-by: Sasha Levin <levinsasha928@gmail.com>
---
include/linux/nmi.h | 3 +--
kernel/sysctl.c | 9 ++++++---
kernel/watchdog.c | 12 ++----------
3 files changed, 9 insertions(+), 15 deletions(-)
diff --git a/include/linux/nmi.h b/include/linux/nmi.h
index db50840..7a8030d 100644
--- a/include/linux/nmi.h
+++ b/include/linux/nmi.h
@@ -49,8 +49,7 @@ u64 hw_nmi_get_sample_period(int watchdog_thresh);
extern int watchdog_enabled;
extern int watchdog_thresh;
struct ctl_table;
-extern int proc_dowatchdog(struct ctl_table *, int ,
- void __user *, size_t *, loff_t *);
+extern int proc_dowatchdog(void);
#endif
#endif
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index bde6087..2fac00a 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -737,7 +737,8 @@ static struct ctl_table kern_table[] = {
.data = &watchdog_enabled,
.maxlen = sizeof (int),
.mode = 0644,
- .proc_handler = proc_dowatchdog,
+ .proc_handler = proc_dointvec_minmax,
+ .callback = proc_dowatchdog,
.extra1 = &zero,
.extra2 = &one,
},
@@ -746,7 +747,8 @@ static struct ctl_table kern_table[] = {
.data = &watchdog_thresh,
.maxlen = sizeof(int),
.mode = 0644,
- .proc_handler = proc_dowatchdog,
+ .proc_handler = proc_dointvec_minmax,
+ .callback = proc_dowatchdog,
.extra1 = &neg_one,
.extra2 = &sixty,
},
@@ -764,7 +766,8 @@ static struct ctl_table kern_table[] = {
.data = &watchdog_enabled,
.maxlen = sizeof (int),
.mode = 0644,
- .proc_handler = proc_dowatchdog,
+ .proc_handler = proc_dointvec_minmax,
+ .callback = proc_dowatchdog,
.extra1 = &zero,
.extra2 = &one,
},
diff --git a/kernel/watchdog.c b/kernel/watchdog.c
index e5e1d85..56bef16 100644
--- a/kernel/watchdog.c
+++ b/kernel/watchdog.c
@@ -535,22 +535,14 @@ static void watchdog_disable_all_cpus(void)
* proc handler for /proc/sys/kernel/nmi_watchdog,watchdog_thresh
*/
-int proc_dowatchdog(struct ctl_table *table, int write,
- void __user *buffer, size_t *lenp, loff_t *ppos)
+int proc_dowatchdog(void)
{
- int ret;
-
- ret = proc_dointvec_minmax(table, write, buffer, lenp, ppos);
- if (ret || !write)
- goto out;
-
if (watchdog_enabled && watchdog_thresh)
watchdog_enable_all_cpus();
else
watchdog_disable_all_cpus();
-out:
- return ret;
+ return 0;
}
#endif /* CONFIG_SYSCTL */
--
1.7.8.5
next prev parent reply other threads:[~2012-04-29 6:45 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-29 6:45 [PATCH 01/14] sysctl: provide callback for write into ctl_table entry Sasha Levin
2012-04-29 6:45 ` [PATCH 02/14] sched debug,sysctl: remove proc input checks out of sysctl handlers Sasha Levin
2012-04-29 6:45 ` [PATCH 03/14] sched rt,sysctl: " Sasha Levin
2012-04-30 2:32 ` Eric Paris
2012-04-29 6:45 ` [PATCH 04/14] ftrace,sysctl: " Sasha Levin
2012-04-29 6:45 ` [PATCH 05/14] sysrq,sysctl: " Sasha Levin
2012-04-29 6:45 ` [PATCH 06/14] watchdog,sysctl: remove unused external Sasha Levin
2012-04-29 6:45 ` Sasha Levin [this message]
2012-04-29 6:45 ` [PATCH 08/14] hung task,sysctl: remove proc input checks out of sysctl handlers Sasha Levin
2012-04-29 6:45 ` [PATCH 09/14] perf,sysctl: " Sasha Levin
2012-04-29 6:45 ` [PATCH 10/14] mm,sysctl: " Sasha Levin
2012-04-29 6:45 ` [PATCH 11/14] hugetlb,sysctl: " Sasha Levin
2012-04-29 6:45 ` [PATCH 12/14] mm compaction,sysctl: " Sasha Levin
2012-04-29 6:45 ` [PATCH 13/14] security,sysctl: " Sasha Levin
2012-04-30 2:28 ` Eric Paris
2012-04-29 6:45 ` [PATCH 14/14] fs,sysctl: " Sasha Levin
2012-04-29 8:22 ` [PATCH 01/14] sysctl: provide callback for write into ctl_table entry Eric W. Biederman
2012-04-29 12:07 ` Sasha Levin
2012-04-29 14:00 ` Steven Rostedt
2012-04-29 14:14 ` Sasha Levin
2012-04-29 19:57 ` Steven Rostedt
2012-04-30 2:52 ` Eric W. Biederman
2012-04-29 12:26 ` Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1335681937-3715-7-git-send-email-levinsasha928@gmail.com \
--to=levinsasha928@gmail.com \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@ghostprotocols.net \
--cc=akpm@linux-foundation.org \
--cc=ebiederm@xmission.com \
--cc=fweisbec@gmail.com \
--cc=james.l.morris@oracle.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-security-module@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=paulus@samba.org \
--cc=rostedt@goodmis.org \
--cc=tglx@linutronix.de \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).