prctl: make PR_SET_TIMERSLACK_PID pid namespace aware
authorMicha Kalfon <micha@cellrox.com>
Tue, 13 Jan 2015 10:12:57 +0000 (12:12 +0200)
committerRuchi Kandoi <kandoiruchi@google.com>
Tue, 13 Jan 2015 23:35:55 +0000 (23:35 +0000)
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>
kernel/sys.c

index 33192c2785b23395fcfc90b666a55de634cb30b6..a3bef5bd452b6ab64a8604ca5f661530d4ef4895 100644 (file)
@@ -2397,11 +2397,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;