diff options
| -rw-r--r-- | include/linux/pid.h | 5 | ||||
| -rw-r--r-- | kernel/capability.c | 2 | ||||
| -rw-r--r-- | kernel/pid.c | 12 |
3 files changed, 15 insertions, 4 deletions
diff --git a/include/linux/pid.h b/include/linux/pid.h index 4817c6671e77..e29a900a8499 100644 --- a/include/linux/pid.h +++ b/include/linux/pid.h @@ -110,9 +110,8 @@ extern struct pid_namespace init_pid_ns; * see also find_task_by_pid() set in include/linux/sched.h */ extern struct pid *FASTCALL(find_pid_ns(int nr, struct pid_namespace *ns)); - -#define find_vpid(pid) find_pid_ns(pid, current->nsproxy->pid_ns) -#define find_pid(pid) find_pid_ns(pid, &init_pid_ns) +extern struct pid *find_vpid(int nr); +extern struct pid *find_pid(int nr); /* * Lookup a PID in the hash table, and return with it's count elevated. diff --git a/kernel/capability.c b/kernel/capability.c index 0d0d886d1e84..efbd9cdce132 100644 --- a/kernel/capability.c +++ b/kernel/capability.c @@ -96,7 +96,7 @@ static inline int cap_set_pg(int pgrp_nr, kernel_cap_t *effective, int found = 0; struct pid *pgrp; - pgrp = find_pid_ns(pgrp_nr, current->nsproxy->pid_ns); + pgrp = find_vpid(pgrp_nr); do_each_pid_task(pgrp, PIDTYPE_PGID, g) { target = g; while_each_thread(g, target) { diff --git a/kernel/pid.c b/kernel/pid.c index bed9e7f80a50..8040533d1a04 100644 --- a/kernel/pid.c +++ b/kernel/pid.c @@ -302,6 +302,18 @@ struct pid * fastcall find_pid_ns(int nr, struct pid_namespace *ns) } EXPORT_SYMBOL_GPL(find_pid_ns); +struct pid *find_vpid(int nr) +{ + return find_pid_ns(nr, current->nsproxy->pid_ns); +} +EXPORT_SYMBOL_GPL(find_vpid); + +struct pid *find_pid(int nr) +{ + return find_pid_ns(nr, &init_pid_ns); +} +EXPORT_SYMBOL_GPL(find_pid); + /* * attach_pid() must be called with the tasklist_lock write-held. */ |