summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicha Kalfon <micha@cellrox.com>2015-01-13 12:12:57 +0200
committerJohn Stultz <john.stultz@linaro.org>2016-02-16 13:53:49 -0800
commitd4d049c55d0f0fa7fb5521a83c7e0c029c80e7c0 (patch)
treeaf0ea648d6aaab5fc098120fc1f94eaa2318a682
parent18f42f60bedb93c9e90641bf9a551f9c0caf0a40 (diff)
prctl: make PR_SET_TIMERSLACK_PID pid namespace aware
Make PR_SET_TIMERSLACK_PID consider pid namespace and resolve the target pid in the caller's namespace. Otherwise, calls from pid namespace other than init would fail or affect the wrong task. Change-Id: I1da15196abc4096536713ce03714e99d2e63820a Signed-off-by: Micha Kalfon <micha@cellrox.com> Acked-by: Oren Laadan <orenl@cellrox.com>
-rw-r--r--kernel/sys.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/sys.c b/kernel/sys.c
index 0f45fb855fe3..66b933a5c061 100644
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -2220,11 +2220,11 @@ SYSCALL_DEFINE5(prctl, int, option, unsigned long, arg2, unsigned long, arg3,
error = prctl_get_tid_address(me, (int __user **)arg2);
break;
case PR_SET_TIMERSLACK_PID:
- if (current->pid != (pid_t)arg3 &&
+ if (task_pid_vnr(current) != (pid_t)arg3 &&
!capable(CAP_SYS_NICE))
return -EPERM;
rcu_read_lock();
- tsk = find_task_by_pid_ns((pid_t)arg3, &init_pid_ns);
+ tsk = find_task_by_vpid((pid_t)arg3);
if (tsk == NULL) {
rcu_read_unlock();
return -EINVAL;