commit 765d6f38a26d618e3d625ae9a7854509a96d2f62
author Linux Build Service Account <lnxbuild@localhost> Thu Feb 26 12:07:51 2015 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Feb 26 12:07:51 2015 -0800
tree 38ffea2439025990614f01e655dcff94a0881387
parent 90d296bf5f399718a7da0be09452b963cb02e844
parent abba9dfa5e13fc0f6922ed606609a96e0b77fd63

Merge "prctl: make PR_SET_TIMERSLACK_PID pid namespace aware"

kernel/sys.c

diff --git a/kernel/sys.c b/kernel/sys.c
index 2f95158..7d01c44 100644
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -2129,11 +2129,11 @@
 			error = prctl_set_vma(arg2, arg3, arg4, arg5);
 			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;