diff options
Diffstat (limited to 'kernel/sys.c')
| -rw-r--r-- | kernel/sys.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/kernel/sys.c b/kernel/sys.c index 23620d52cf37..2befc299129d 100644 --- a/kernel/sys.c +++ b/kernel/sys.c | |||
| @@ -152,8 +152,7 @@ asmlinkage long sys_setpriority(int which, int who, int niceval) | |||
| 152 | switch (which) { | 152 | switch (which) { |
| 153 | case PRIO_PROCESS: | 153 | case PRIO_PROCESS: |
| 154 | if (who) | 154 | if (who) |
| 155 | p = find_task_by_pid_ns(who, | 155 | p = find_task_by_vpid(who); |
| 156 | current->nsproxy->pid_ns); | ||
| 157 | else | 156 | else |
| 158 | p = current; | 157 | p = current; |
| 159 | if (p) | 158 | if (p) |
| @@ -210,8 +209,7 @@ asmlinkage long sys_getpriority(int which, int who) | |||
| 210 | switch (which) { | 209 | switch (which) { |
| 211 | case PRIO_PROCESS: | 210 | case PRIO_PROCESS: |
| 212 | if (who) | 211 | if (who) |
| 213 | p = find_task_by_pid_ns(who, | 212 | p = find_task_by_vpid(who); |
| 214 | current->nsproxy->pid_ns); | ||
| 215 | else | 213 | else |
| 216 | p = current; | 214 | p = current; |
| 217 | if (p) { | 215 | if (p) { |
| @@ -1067,7 +1065,8 @@ asmlinkage long sys_setsid(void) | |||
| 1067 | * session id and so the check will always fail and make it so | 1065 | * session id and so the check will always fail and make it so |
| 1068 | * init cannot successfully call setsid. | 1066 | * init cannot successfully call setsid. |
| 1069 | */ | 1067 | */ |
| 1070 | if (session > 1 && find_task_by_pid_type(PIDTYPE_PGID, session)) | 1068 | if (session > 1 && find_task_by_pid_type_ns(PIDTYPE_PGID, |
| 1069 | session, &init_pid_ns)) | ||
| 1071 | goto out; | 1070 | goto out; |
| 1072 | 1071 | ||
| 1073 | group_leader->signal->leader = 1; | 1072 | group_leader->signal->leader = 1; |