From owner-trustedbsd-cvs@FreeBSD.ORG  Sun Sep 14 09:45:26 2014
Return-Path: <owner-trustedbsd-cvs@FreeBSD.ORG>
Delivered-To: trustedbsd-cvs@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id CDC55A3E
 for <trustedbsd-cvs@freebsd.org>; Sun, 14 Sep 2014 09:45:26 +0000 (UTC)
Received: from cyrus.watson.org (cyrus.watson.org [198.74.231.69])
 by mx1.freebsd.org (Postfix) with ESMTP id 96E23E1B
 for <trustedbsd-cvs@freebsd.org>; Sun, 14 Sep 2014 09:45:26 +0000 (UTC)
Received: from mx2.freebsd.org (mx2.freebsd.org [8.8.178.116])
 by cyrus.watson.org (Postfix) with ESMTPS id 1485746BA0
 for <trustedbsd-cvs@trustedbsd.org>; Sun, 14 Sep 2014 05:45:20 -0400 (EDT)
Received: from hub.freebsd.org (hub.freebsd.org [8.8.178.136])
 (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits))
 (No client certificate requested)
 by mx2.freebsd.org (Postfix) with ESMTPS id 379BA48D3;
 Sun, 14 Sep 2014 09:45:19 +0000 (UTC)
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id 303C4956; Sun, 14 Sep 2014 09:45:19 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id E6B5D954
 for <perforce@freebsd.org>; Sun, 14 Sep 2014 09:45:18 +0000 (UTC)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
 [IPv6:2001:1900:2254:2068::682:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id D236DE16
 for <perforce@freebsd.org>; Sun, 14 Sep 2014 09:45:18 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s8E9jIf8047117
 for <perforce@freebsd.org>; Sun, 14 Sep 2014 09:45:18 GMT
 (envelope-from pjd@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s8E9jIsA047114
 for perforce@freebsd.org; Sun, 14 Sep 2014 09:45:18 GMT
 (envelope-from pjd@freebsd.org)
Date: Sun, 14 Sep 2014 09:45:18 GMT
Message-Id: <201409140945.s8E9jIsA047114@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 pjd@freebsd.org using -f
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
Subject: PERFORCE change 1200237 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: trustedbsd-cvs@FreeBSD.org
X-Mailman-Version: 2.1.18-1
List-Id: TrustedBSD CVS and Perforce commit message list
 <trustedbsd-cvs.FreeBSD.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/trustedbsd-cvs>,
 <mailto:trustedbsd-cvs-request@FreeBSD.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/trustedbsd-cvs/>
List-Post: <mailto:trustedbsd-cvs@FreeBSD.org>
List-Help: <mailto:trustedbsd-cvs-request@FreeBSD.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/trustedbsd-cvs>,
 <mailto:trustedbsd-cvs-request@FreeBSD.org?subject=subscribe>
X-List-Received-Date: Sun, 14 Sep 2014 09:45:26 -0000

http://p4web.freebsd.org/@@1200237?ac=10

Change 1200237 by pjd@pjd_anger on 2014/09/14 09:45:07

	Fix descriptors leak.
	
	PR:		bin/191002
	Reported by:	Ryan Steinmetz
	Submitted by:	mjg

Affected files ...

.. //depot/projects/trustedbsd/openbsm/bin/auditdistd/subr.c#4 edit

Differences ...

==== //depot/projects/trustedbsd/openbsm/bin/auditdistd/subr.c#4 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/subr.c#3 $
+ * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/subr.c#4 $
  */
 
 #include <config/config.h>
@@ -228,6 +228,11 @@
 	PJDLOG_ASSERT(fd != -1);
 
 #ifdef HAVE_KQUEUE
+	if (wait_for_file_kq != -1) {
+		close(wait_for_file_kq);
+		wait_for_file_kq = -1;
+	}
+
 	kq = kqueue();
 	if (kq == -1) {
 		pjdlog_errno(LOG_WARNING, "kqueue() failed");