1 files changed, 21 insertions, 15 deletions

diff --git a/kernel/sys.c b/kernel/sys.c
index ddd28e261f3a..895d2d4c9493 100644
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -991,31 +991,37 @@ out:
 
 asmlinkage long sys_getpgid(pid_t pid)
 {
+        struct task_struct *p;
+        struct pid *grp;
+        int retval;
+
+        rcu_read_lock();
         if (!pid)
-                return task_pgrp_vnr(current);
+                grp = task_pgrp(current);
         else {
-                int retval;
-                struct task_struct *p;
-
-                read_lock(&tasklist_lock);
-                p = find_task_by_vpid(pid);
                 retval = -ESRCH;
-                if (p) {
-                        retval = security_task_getpgid(p);
-                        if (!retval)
-                                retval = task_pgrp_vnr(p);
-                }
-                read_unlock(&tasklist_lock);
-                return retval;
+                p = find_task_by_vpid(pid);
+                if (!p)
+                        goto out;
+                grp = task_pgrp(p);
+                if (!grp)
+                        goto out;
+
+                retval = security_task_getpgid(p);
+                if (retval)
+                        goto out;
         }
+        retval = pid_vnr(grp);
+out:
+        rcu_read_unlock();
+        return retval;
 }
 
 #ifdef __ARCH_WANT_SYS_GETPGRP
 
 asmlinkage long sys_getpgrp(void)
 {
-        /* SMP - assuming writes are word atomic this is fine */
-        return task_pgrp_vnr(current);
+        return sys_getpgid(0);
 }
 
 #endif