1 files changed, 20 insertions, 13 deletions

diff --git a/kernel/sys.c b/kernel/sys.c
index 5d0b44cd435c..ddd28e261f3a 100644
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -1022,23 +1022,30 @@ asmlinkage long sys_getpgrp(void)
 
 asmlinkage long sys_getsid(pid_t pid)
 {
+        struct task_struct *p;
+        struct pid *sid;
+        int retval;
+
+        rcu_read_lock();
         if (!pid)
-                return task_session_vnr(current);
+                sid = task_session(current);
         else {
-                int retval;
-                struct task_struct *p;
-
-                rcu_read_lock();
-                p = find_task_by_vpid(pid);
                 retval = -ESRCH;
-                if (p) {
-                        retval = security_task_getsid(p);
-                        if (!retval)
-                                retval = task_session_vnr(p);
-                }
-                rcu_read_unlock();
-                return retval;
+                p = find_task_by_vpid(pid);
+                if (!p)
+                        goto out;
+                sid = task_session(p);
+                if (!sid)
+                        goto out;
+
+                retval = security_task_getsid(p);
+                if (retval)
+                        goto out;
         }
+        retval = pid_vnr(sid);
+out:
+        rcu_read_unlock();
+        return retval;
 }
 
 asmlinkage long sys_setsid(void)