From owner-svn-src-head@freebsd.org  Fri Jun 23 17:39:01 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 53373D8607D;
 Fri, 23 Jun 2017 17:39:01 +0000 (UTC)
 (envelope-from sobomax@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 2015F6A382;
 Fri, 23 Jun 2017 17:39:01 +0000 (UTC)
 (envelope-from sobomax@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v5NHd0d6039901;
 Fri, 23 Jun 2017 17:39:00 GMT (envelope-from sobomax@FreeBSD.org)
Received: (from sobomax@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v5NHd05x039900;
 Fri, 23 Jun 2017 17:39:00 GMT (envelope-from sobomax@FreeBSD.org)
Message-Id: <201706231739.v5NHd05x039900@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: sobomax set sender to
 sobomax@FreeBSD.org using -f
From: Maxim Sobolev <sobomax@FreeBSD.org>
Date: Fri, 23 Jun 2017 17:39:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r320277 - head/usr.bin/mkuzip
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 23 Jun 2017 17:39:01 -0000

Author: sobomax
Date: Fri Jun 23 17:39:00 2017
New Revision: 320277
URL: https://svnweb.freebsd.org/changeset/base/320277

Log:
  Don't leak file descriptor in some cases.
  
  Reported by:	cem
  MFC after:	6 weeks

Modified:
  head/usr.bin/mkuzip/mkuz_insize.c

Modified: head/usr.bin/mkuzip/mkuz_insize.c
==============================================================================
--- head/usr.bin/mkuzip/mkuz_insize.c	Fri Jun 23 17:31:07 2017	(r320276)
+++ head/usr.bin/mkuzip/mkuz_insize.c	Fri Jun 23 17:39:00 2017	(r320277)
@@ -34,6 +34,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/stat.h>
 #include <err.h>
 #include <fcntl.h>
+#include <unistd.h>
 
 #include "mkuz_cfg.h"
 #include "mkuz_insize.h"
@@ -58,12 +59,15 @@ mkuz_get_insize(struct mkuz_cfg *cfp)
 		ffd = open(statfsbuf.f_mntfromname, O_RDONLY);
 		if (ffd < 0) {
 			warn("open(%s, O_RDONLY)", statfsbuf.f_mntfromname);
+			close(ffd);
 			return (-1);
 		}
 		if (ioctl(ffd, DIOCGMEDIASIZE, &ms) < 0) {
 			warn("ioctl(DIOCGMEDIASIZE)");
+			close(ffd);
 			return (-1);
 		}
+		close(ffd);
 		sb.st_size = ms;
 	} else if (S_ISCHR(sb.st_mode)) {
 		if (ioctl(cfp->fdr, DIOCGMEDIASIZE, &ms) < 0) {