diff options
author | John Stultz <john.stultz@linaro.org> | 2016-10-07 20:02:29 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-07 21:46:30 -0400 |
commit | 904763e1fb5eebf8249ec41a2019e5e32246df2f (patch) | |
tree | c74767dca5a638371a2cb3121a207ed7137b7b2a | |
parent | 7abbaf94049914f074306d960b0f968ffe52e59f (diff) |
proc: add LSM hook checks to /proc/<tid>/timerslack_ns
As requested, this patch checks the existing LSM hooks
task_getscheduler/task_setscheduler when reading or modifying the task's
timerslack value.
Previous versions added new get/settimerslack LSM hooks, but since they
checked the same PROCESS__SET/GETSCHED values as existing hooks, it was
suggested we just use the existing ones.
Link: http://lkml.kernel.org/r/1469132667-17377-2-git-send-email-john.stultz@linaro.org
Signed-off-by: John Stultz <john.stultz@linaro.org>
Cc: Kees Cook <keescook@chromium.org>
Cc: "Serge E. Hallyn" <serge@hallyn.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Arjan van de Ven <arjan@linux.intel.com>
Cc: Oren Laadan <orenl@cellrox.com>
Cc: Ruchi Kandoi <kandoiruchi@google.com>
Cc: Rom Lemarchand <romlem@android.com>
Cc: Todd Kjos <tkjos@google.com>
Cc: Colin Cross <ccross@android.com>
Cc: Nick Kralevich <nnk@google.com>
Cc: Dmitry Shmidt <dimitrysh@google.com>
Cc: Elliott Hughes <enh@google.com>
Cc: James Morris <jmorris@namei.org>
Cc: Android Kernel Team <kernel-team@android.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | fs/proc/base.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/fs/proc/base.c b/fs/proc/base.c index 248f008d46b8..ebccdc192830 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c | |||
@@ -2285,6 +2285,12 @@ static ssize_t timerslack_ns_write(struct file *file, const char __user *buf, | |||
2285 | goto out; | 2285 | goto out; |
2286 | } | 2286 | } |
2287 | 2287 | ||
2288 | err = security_task_setscheduler(p); | ||
2289 | if (err) { | ||
2290 | count = err; | ||
2291 | goto out; | ||
2292 | } | ||
2293 | |||
2288 | task_lock(p); | 2294 | task_lock(p); |
2289 | if (slack_ns == 0) | 2295 | if (slack_ns == 0) |
2290 | p->timer_slack_ns = p->default_timer_slack_ns; | 2296 | p->timer_slack_ns = p->default_timer_slack_ns; |
@@ -2313,6 +2319,10 @@ static int timerslack_ns_show(struct seq_file *m, void *v) | |||
2313 | goto out; | 2319 | goto out; |
2314 | } | 2320 | } |
2315 | 2321 | ||
2322 | err = security_task_getscheduler(p); | ||
2323 | if (err) | ||
2324 | goto out; | ||
2325 | |||
2316 | task_lock(p); | 2326 | task_lock(p); |
2317 | seq_printf(m, "%llu\n", p->timer_slack_ns); | 2327 | seq_printf(m, "%llu\n", p->timer_slack_ns); |
2318 | task_unlock(p); | 2328 | task_unlock(p); |