Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759446AbYCWRrK (ORCPT ); Sun, 23 Mar 2008 13:47:10 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754762AbYCWRqi (ORCPT ); Sun, 23 Mar 2008 13:46:38 -0400 Received: from x346.tv-sign.ru ([89.108.83.215]:50273 "EHLO mail.screens.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754549AbYCWRqh (ORCPT ); Sun, 23 Mar 2008 13:46:37 -0400 Date: Sun, 23 Mar 2008 20:51:36 +0300 From: Oleg Nesterov To: Andrew Morton Cc: "Eric W. Biederman" , Pavel Emelyanov , linux-kernel@vger.kernel.org Subject: [PATCH] pids: sys_getsid: make sure we don't return 0 instead of -ESRCH Message-ID: <20080323175136.GA3353@tv-sign.ru> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.11 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1064 Lines: 38 The task can exit between find_task_by_vpid() and task_session_vnr(), in that unlikely case sys_getsid() returns 0 instead of -ESRCH. The bug was introduced by me in ac9a8e3f0f43d20fc316162e8e5f9186d295ff49. Signed-off-by: Oleg Nesterov --- 25/kernel/sys.c~1_GETSID 2008-03-20 18:21:17.000000000 +0300 +++ 25/kernel/sys.c 2008-03-23 19:25:36.000000000 +0300 @@ -1019,19 +1019,19 @@ asmlinkage long sys_getsid(pid_t pid) if (!pid) return task_session_vnr(current); else { - int retval; + int retval = 0; 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; + + return retval ?: -ESRCH; } } -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/