From owner-svn-src-head@FreeBSD.ORG  Wed May 30 03:55:44 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 9F33F106566B;
	Wed, 30 May 2012 03:55:44 +0000 (UTC)
	(envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 8ADBE8FC17;
	Wed, 30 May 2012 03:55:44 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q4U3tiVv024289;
	Wed, 30 May 2012 03:55:44 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q4U3tia1024287;
	Wed, 30 May 2012 03:55:44 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201205300355.q4U3tia1024287@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Wed, 30 May 2012 03:55:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r236286 - head/usr.bin/mail
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 30 May 2012 03:55:44 -0000

Author: eadler
Date: Wed May 30 03:55:44 2012
New Revision: 236286
URL: http://svn.freebsd.org/changeset/base/236286

Log:
  Fix likely race condition if wait_child() is interrupted by sigchild()
  
  PR:		bin/102834
  Submitted by:	Andreas Longwitz <longwitz@incore.de>
  Approved by:	cperciva
  MFC after:	2 weeks

Modified:
  head/usr.bin/mail/popen.c

Modified: head/usr.bin/mail/popen.c
==============================================================================
--- head/usr.bin/mail/popen.c	Wed May 30 03:54:10 2012	(r236285)
+++ head/usr.bin/mail/popen.c	Wed May 30 03:55:44 2012	(r236286)
@@ -336,12 +336,14 @@ int
 wait_child(int pid)
 {
 	sigset_t nset, oset;
-	struct child *cp = findchild(pid);
+	struct child *cp;
 
 	(void)sigemptyset(&nset);
 	(void)sigaddset(&nset, SIGCHLD);
 	(void)sigprocmask(SIG_BLOCK, &nset, &oset);	
 
+	cp = findchild(pid);
+
 	while (!cp->done)
 		(void)sigsuspend(&oset);
 	wait_status = cp->status;