From owner-svn-src-stable@FreeBSD.ORG  Wed Jun 13 03:41:42 2012
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 9961B1065674;
	Wed, 13 Jun 2012 03:41:42 +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 841AB8FC0A;
	Wed, 13 Jun 2012 03:41:42 +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 q5D3fgjG093338;
	Wed, 13 Jun 2012 03:41:42 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5D3fgIB093336;
	Wed, 13 Jun 2012 03:41:42 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201206130341.q5D3fgIB093336@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Wed, 13 Jun 2012 03:41:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r236986 - stable/7/usr.bin/mail
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 13 Jun 2012 03:41:42 -0000

Author: eadler
Date: Wed Jun 13 03:41:42 2012
New Revision: 236986
URL: http://svn.freebsd.org/changeset/base/236986

Log:
  MFC r236286:
  	Fix likely race condition if wait_child() is interrupted by sigchild()
  
  PR:		bin/102834
  Approved by:	cperciva (implicit)

Modified:
  stable/7/usr.bin/mail/popen.c
Directory Properties:
  stable/7/usr.bin/mail/   (props changed)

Modified: stable/7/usr.bin/mail/popen.c
==============================================================================
--- stable/7/usr.bin/mail/popen.c	Wed Jun 13 03:41:22 2012	(r236985)
+++ stable/7/usr.bin/mail/popen.c	Wed Jun 13 03:41:42 2012	(r236986)
@@ -364,12 +364,14 @@ wait_child(pid)
 	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;