From owner-p4-projects@FreeBSD.ORG  Tue Sep 27 08:59:46 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 58E7616A421; Tue, 27 Sep 2005 08:59:46 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 23F8316A41F
	for <perforce@freebsd.org>; Tue, 27 Sep 2005 08:59:46 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id E3E3243D49
	for <perforce@freebsd.org>; Tue, 27 Sep 2005 08:59:45 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j8R8xjHL078407
	for <perforce@freebsd.org>; Tue, 27 Sep 2005 08:59:45 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j8R8xjra078404
	for perforce@freebsd.org; Tue, 27 Sep 2005 08:59:45 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Tue, 27 Sep 2005 08:59:45 GMT
Message-Id: <200509270859.j8R8xjra078404@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 84335 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 27 Sep 2005 08:59:47 -0000

http://perforce.freebsd.org/chv.cgi?CH=84335

Change 84335 by rwatson@rwatson_zoo on 2005/09/27 08:59:23

	When creating a log file with open(), don't just drop the file
	descriptor on the floor, close() it.  This closes a file descriptor
	leak that occurs when the log cycle is cycled.

Affected files ...

.. //depot/projects/trustedbsd/audit3/contrib/audit_supt/auditd/auditd.c#12 edit

Differences ...

==== //depot/projects/trustedbsd/audit3/contrib/audit_supt/auditd/auditd.c#12 (text+ko) ====

@@ -166,6 +166,7 @@
 	char *fn;
 	char TS[POSTFIX_LEN];
 	struct dir_ent *dirent;
+	int fd;
 
 	if(getTSstr(TS, POSTFIX_LEN) != 0) {
 		return -1;
@@ -182,19 +183,26 @@
 			return -1;
 		}
 
+		/*
+		 * Create and open the file; then close and pass to the
+		 * kernel if all went well.
+		 */
 		syslog(LOG_INFO, "New audit file is %s\n", fn);
-		if (open(fn, O_RDONLY | O_CREAT, S_IRUSR | S_IRGRP) < 0) {
+		fd = open(fn, O_RDONLY | O_CREAT, S_IRUSR | S_IRGRP);
+		if (fd < 0) {
 			perror("File open");
 		}
 		else if (auditctl(fn) != 0) {
 			syslog(LOG_ERR, 
 				"auditctl failed setting log file! : %s\n", 
 				strerror(errno));
+			close(fd);
 		}
 		else {
 			/* Success */ 
 			close_lastfile(TS);
 			lastfile = fn;
+			close(fd);
 			return 0;
 		}