From owner-svn-src-all@freebsd.org  Wed Apr 20 00:49:50 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 385D7B139F1;
 Wed, 20 Apr 2016 00:49:50 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a: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 08FE91BB3;
 Wed, 20 Apr 2016 00:49:49 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3K0nnnv015759;
 Wed, 20 Apr 2016 00:49:49 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3K0nnMW015758;
 Wed, 20 Apr 2016 00:49:49 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201604200049.u3K0nnMW015758@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Wed, 20 Apr 2016 00:49:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r298315 - head/sbin/savecore
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.21
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: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 20 Apr 2016 00:49:50 -0000

Author: ngie
Date: Wed Apr 20 00:49:49 2016
New Revision: 298315
URL: https://svnweb.freebsd.org/changeset/base/298315

Log:
  Don't leak fd on sectorsize malloc failure
  
  Also, call endfsent after calling getfsent (i.e. when not explicitly called
  with a swap device) for code cleanliness
  
  CID: 1354785
  Differential Revision: https://reviews.freebsd.org/D6014
  X-MFC with: r298076
  Reported by: Coverity
  Reviewed by: cem
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/sbin/savecore/savecore.c

Modified: head/sbin/savecore/savecore.c
==============================================================================
--- head/sbin/savecore/savecore.c	Wed Apr 20 00:49:37 2016	(r298314)
+++ head/sbin/savecore/savecore.c	Wed Apr 20 00:49:49 2016	(r298315)
@@ -502,7 +502,7 @@ DoFile(const char *savedir, const char *
 		temp = malloc(sectorsize);
 		if (temp == NULL) {
 			syslog(LOG_ERR, "%m");
-			return;
+			goto closefd;
 		}
 	}
 	if (lseek(fd, lasthd, SEEK_SET) != lasthd ||
@@ -845,6 +845,7 @@ main(int argc, char **argv)
 				continue;
 			DoFile(savedir, fsp->fs_spec);
 		}
+		endfsent();
 	} else {
 		for (i = 0; i < argc; i++)
 			DoFile(savedir, argv[i]);