From owner-svn-src-head@freebsd.org  Wed Dec 30 18:04:51 2015
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 6B62BA5568A;
 Wed, 30 Dec 2015 18:04:51 +0000 (UTC) (envelope-from jtl@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 3CA341B43;
 Wed, 30 Dec 2015 18:04:51 +0000 (UTC) (envelope-from jtl@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBUI4oar065467;
 Wed, 30 Dec 2015 18:04:50 GMT (envelope-from jtl@FreeBSD.org)
Received: (from jtl@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBUI4oGp065466;
 Wed, 30 Dec 2015 18:04:50 GMT (envelope-from jtl@FreeBSD.org)
Message-Id: <201512301804.tBUI4oGp065466@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jtl set sender to jtl@FreeBSD.org
 using -f
From: "Jonathan T. Looney" <jtl@FreeBSD.org>
Date: Wed, 30 Dec 2015 18:04:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r292955 - head/lib/libmd
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.20
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: Wed, 30 Dec 2015 18:04:51 -0000

Author: jtl
Date: Wed Dec 30 18:04:50 2015
New Revision: 292955
URL: https://svnweb.freebsd.org/changeset/base/292955

Log:
  Fix a file descriptor leak in mdXhl.c (which is used by numerous hashing
  algorithms.
  
  CID:	1305669,1305611,1305663,1305603,1305584,1305639,1346865,1305601
  Differential Revision:	https://reviews.freebsd.org/D4732
  Reviewed by:	allanjude, delphij
  MFC after:	2 weeks
  Sponsored by:	Juniper Networks

Modified:
  head/lib/libmd/mdXhl.c

Modified: head/lib/libmd/mdXhl.c
==============================================================================
--- head/lib/libmd/mdXhl.c	Wed Dec 30 17:36:34 2015	(r292954)
+++ head/lib/libmd/mdXhl.c	Wed Dec 30 18:04:50 2015	(r292955)
@@ -59,14 +59,18 @@ MDXFileChunk(const char *filename, char 
 	f = open(filename, O_RDONLY);
 	if (f < 0)
 		return 0;
-	if (fstat(f, &stbuf) < 0)
-		return 0;
+	if (fstat(f, &stbuf) < 0) {
+		i = -1;
+		goto error;
+	}
 	if (ofs > stbuf.st_size)
 		ofs = stbuf.st_size;
 	if ((len == 0) || (len > stbuf.st_size - ofs))
 		len = stbuf.st_size - ofs;
-	if (lseek(f, ofs, SEEK_SET) < 0)
-		return 0;
+	if (lseek(f, ofs, SEEK_SET) < 0) {
+		i = -1;
+		goto error;
+	}
 	n = len;
 	i = 0;
 	while (n > 0) {
@@ -79,6 +83,7 @@ MDXFileChunk(const char *filename, char 
 		MDXUpdate(&ctx, buffer, i);
 		n -= i;
 	} 
+error:
 	e = errno;
 	close(f);
 	errno = e;