pids: sys_getsid: fix unsafe *pid usage, fix possible 0 instead of -ESRCH
PATCH 1/2 pids: sys_getsid: fix unsafe *pid usage, fix possible 0 instead of -ESRCH
1. sys_getsid() needs rcu_read_lock() to derive the session _nr, even if the task is current, otherwise we can race with another thread which does sys_setsid().
2. The task can exit between find_task_by_vpid() and task_session_vnr(), in that unlikely case sys_getsid() returns 0 instead of -ESRCH.
Signed-off-by Oleg Nesterov <[email protected]>
kernel/sys.c renamed from kernel/sys.c~1_GETSID +20 -13
@@ -1016,23 +1016,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 )