From 64e2a61f33e0a965f396a498a98fb3c78a07b500 Mon Sep 17 00:00:00 2001
From: Oleg Nesterov <oleg@tv-sign.ru>
Date: Thu, 30 Aug 2007 23:56:27 -0700
Subject: [PATCH] --- yaml --- r: 64628 b: refs/heads/master c:
 b07e35f94a7b6a059f889b904529ee907dc0634d h: refs/heads/master v: v3

---
 [refs]             | 2 +-
 trunk/kernel/sys.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 0e97729f43d3..0f62c4893d89 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5d540fb71552b9f2c542bea967200c48be2d8ef6
+refs/heads/master: b07e35f94a7b6a059f889b904529ee907dc0634d
diff --git a/trunk/kernel/sys.c b/trunk/kernel/sys.c
index 449b81b98b3d..1b33b05d346b 100644
--- a/trunk/kernel/sys.c
+++ b/trunk/kernel/sys.c
@@ -1442,7 +1442,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;
@@ -1470,7 +1469,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 (task_session(p) != task_session(group_leader))
 			goto out;