From owner-svn-src-all@FreeBSD.ORG  Wed Nov 23 10:27:19 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 46ED9106566B;
	Wed, 23 Nov 2011 10:27:19 +0000 (UTC)
	(envelope-from kevlo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 360F08FC1B;
	Wed, 23 Nov 2011 10:27:19 +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 pANARJRt038664;
	Wed, 23 Nov 2011 10:27:19 GMT (envelope-from kevlo@svn.freebsd.org)
Received: (from kevlo@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pANARJMH038660;
	Wed, 23 Nov 2011 10:27:19 GMT (envelope-from kevlo@svn.freebsd.org)
Message-Id: <201111231027.pANARJMH038660@svn.freebsd.org>
From: Kevin Lo <kevlo@FreeBSD.org>
Date: Wed, 23 Nov 2011 10:27:19 +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: r227876 - in head/usr.sbin: acpi/acpidb
	bluetooth/bt3cfw boot0cfg
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 23 Nov 2011 10:27:19 -0000

Author: kevlo
Date: Wed Nov 23 10:27:18 2011
New Revision: 227876
URL: http://svn.freebsd.org/changeset/base/227876

Log:
  Plug fd leaks

Modified:
  head/usr.sbin/acpi/acpidb/acpidb.c
  head/usr.sbin/bluetooth/bt3cfw/bt3cfw.c
  head/usr.sbin/boot0cfg/boot0cfg.c

Modified: head/usr.sbin/acpi/acpidb/acpidb.c
==============================================================================
--- head/usr.sbin/acpi/acpidb/acpidb.c	Wed Nov 23 09:45:48 2011	(r227875)
+++ head/usr.sbin/acpi/acpidb/acpidb.c	Wed Nov 23 10:27:18 2011	(r227876)
@@ -370,6 +370,7 @@ load_dsdt(const char *dsdtfile)
 	}
 	if (fstat(fd, &sb) == -1) {
 		perror("fstat");
+		close(fd);
 		return (-1);
 	}
 	code = mmap(NULL, (size_t)sb.st_size, PROT_READ, MAP_PRIVATE, fd, (off_t)0);

Modified: head/usr.sbin/bluetooth/bt3cfw/bt3cfw.c
==============================================================================
--- head/usr.sbin/bluetooth/bt3cfw/bt3cfw.c	Wed Nov 23 09:45:48 2011	(r227875)
+++ head/usr.sbin/bluetooth/bt3cfw/bt3cfw.c	Wed Nov 23 10:27:18 2011	(r227876)
@@ -221,6 +221,7 @@ main(int argc, char *argv[])
 
 	free(firmware);
 	firmware = NULL;
+	fclose(firmware_file);
 
 	return (0);
 }

Modified: head/usr.sbin/boot0cfg/boot0cfg.c
==============================================================================
--- head/usr.sbin/boot0cfg/boot0cfg.c	Wed Nov 23 09:45:48 2011	(r227875)
+++ head/usr.sbin/boot0cfg/boot0cfg.c	Wed Nov 23 10:27:18 2011	(r227876)
@@ -330,10 +330,12 @@ read_mbr(const char *disk, u_int8_t **mb
 	    err(1, "%s", disk);
 	if (n != mbr_size)
 	    errx(1, "%s: short read", disk);
+	close(fd);
 	return (mbr_size);
     }
     *mbr = malloc(sizeof(buf));
     memcpy(*mbr, buf, sizeof(buf));
+    close(fd);
 
     return sizeof(buf);
 }