diff options
| author | Oleg Nesterov <oleg@tv-sign.ru> | 2007-08-30 23:56:27 -0700 |
|---|---|---|
| committer | Willy Tarreau <w@1wt.eu> | 2007-10-17 21:30:29 +0200 |
| commit | 56a35d830d0aa88e8843d567f91374d86108162c (patch) | |
| tree | 4bbc35b655702bf22494cc9a129eb4db72a53f44 | |
| parent | 2fe3251c23d437460c8e48eb50925a643f0ccf32 (diff) | |
| download | linux-stable-56a35d830d0aa88e8843d567f91374d86108162c.tar.gz linux-stable-56a35d830d0aa88e8843d567f91374d86108162c.tar.bz2 linux-stable-56a35d830d0aa88e8843d567f91374d86108162c.zip | |
[PATCH] setpgid(child) fails if the child was forked by sub-thread
commit b07e35f94a7b6a059f889b904529ee907dc0634d in mainline tree
Spotted by Marcin Kowalczyk <qrczak@knm.org.pl>.
sys_setpgid(child) fails if the child was forked by sub-thread.
Fix the "is it our child" check. The previous commit
ee0acf90d320c29916ba8c5c1b2e908d81f5057d was not complete.
(this patch asks for the new same_thread_group() helper, but mainline doesn't
have it yet).
Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
Acked-by: Roland McGrath <roland@redhat.com>
Tested-by: "Marcin 'Qrczak' Kowalczyk" <qrczak@knm.org.pl>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | kernel/sys.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/sys.c b/kernel/sys.c index 475ddbb72e4a..17f8447e451a 100644 --- a/kernel/sys.c +++ b/kernel/sys.c @@ -1358,7 +1358,6 @@ asmlinkage long sys_times(struct tms __user * tbuf) * Auch. Had to add the 'did_exec' flag to conform completely to POSIX. * LBT 04.03.94 */ - asmlinkage long sys_setpgid(pid_t pid, pid_t pgid) { struct task_struct *p; @@ -1386,7 +1385,7 @@ asmlinkage long sys_setpgid(pid_t pid, pid_t pgid) if (!thread_group_leader(p)) goto out; - if (p->real_parent == group_leader) { + if (p->real_parent->tgid == group_leader->tgid) { err = -EPERM; if (process_session(p) != process_session(group_leader)) goto out; |