mirror of
https://github.com/adulau/aha.git
synced 2024-12-28 03:36:19 +00:00
[PATCH] setpgid: should work for sub-threads
setpgid(0, pgid) or setpgid(forked_child_pid, pgid) does not work unless the calling process is a thread_group_leader(). 'man setpgid' does not tell anything about that, so I consider this behaviour is a bug. Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru> Cc: Oren Laadan <orenl@cs.columbia.edu> Cc: Roland McGrath <roland@redhat.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
9a5d3023e6
commit
ee0acf90d3
1 changed files with 6 additions and 5 deletions
11
kernel/sys.c
11
kernel/sys.c
|
@ -1090,10 +1090,11 @@ asmlinkage long sys_times(struct tms __user * tbuf)
|
||||||
asmlinkage long sys_setpgid(pid_t pid, pid_t pgid)
|
asmlinkage long sys_setpgid(pid_t pid, pid_t pgid)
|
||||||
{
|
{
|
||||||
struct task_struct *p;
|
struct task_struct *p;
|
||||||
|
struct task_struct *group_leader = current->group_leader;
|
||||||
int err = -EINVAL;
|
int err = -EINVAL;
|
||||||
|
|
||||||
if (!pid)
|
if (!pid)
|
||||||
pid = current->pid;
|
pid = group_leader->pid;
|
||||||
if (!pgid)
|
if (!pgid)
|
||||||
pgid = pid;
|
pgid = pid;
|
||||||
if (pgid < 0)
|
if (pgid < 0)
|
||||||
|
@ -1113,16 +1114,16 @@ asmlinkage long sys_setpgid(pid_t pid, pid_t pgid)
|
||||||
if (!thread_group_leader(p))
|
if (!thread_group_leader(p))
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
if (p->parent == current || p->real_parent == current) {
|
if (p->parent == current || p->real_parent == group_leader) {
|
||||||
err = -EPERM;
|
err = -EPERM;
|
||||||
if (p->signal->session != current->signal->session)
|
if (p->signal->session != group_leader->signal->session)
|
||||||
goto out;
|
goto out;
|
||||||
err = -EACCES;
|
err = -EACCES;
|
||||||
if (p->did_exec)
|
if (p->did_exec)
|
||||||
goto out;
|
goto out;
|
||||||
} else {
|
} else {
|
||||||
err = -ESRCH;
|
err = -ESRCH;
|
||||||
if (p != current)
|
if (p != group_leader)
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1134,7 +1135,7 @@ asmlinkage long sys_setpgid(pid_t pid, pid_t pgid)
|
||||||
struct task_struct *p;
|
struct task_struct *p;
|
||||||
|
|
||||||
do_each_task_pid(pgid, PIDTYPE_PGID, p) {
|
do_each_task_pid(pgid, PIDTYPE_PGID, p) {
|
||||||
if (p->signal->session == current->signal->session)
|
if (p->signal->session == group_leader->signal->session)
|
||||||
goto ok_pgid;
|
goto ok_pgid;
|
||||||
} while_each_task_pid(pgid, PIDTYPE_PGID, p);
|
} while_each_task_pid(pgid, PIDTYPE_PGID, p);
|
||||||
goto out;
|
goto out;
|
||||||
|
|
Loading…
Reference in a new issue