From owner-svn-src-head@freebsd.org  Wed Mar 22 18:14:57 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 1F82FD17B8A;
 Wed, 22 Mar 2017 18:14:57 +0000 (UTC)
 (envelope-from markj@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 E0AF21154;
 Wed, 22 Mar 2017 18:14:56 +0000 (UTC)
 (envelope-from markj@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2MIEtlX041023;
 Wed, 22 Mar 2017 18:14:55 GMT (envelope-from markj@FreeBSD.org)
Received: (from markj@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2MIEtNM041022;
 Wed, 22 Mar 2017 18:14:55 GMT (envelope-from markj@FreeBSD.org)
Message-Id: <201703221814.v2MIEtNM041022@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: markj set sender to
 markj@FreeBSD.org using -f
From: Mark Johnston <markj@FreeBSD.org>
Date: Wed, 22 Mar 2017 18:14:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r315727 - head/lib/librtld_db
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: Wed, 22 Mar 2017 18:14:57 -0000

Author: markj
Date: Wed Mar 22 18:14:55 2017
New Revision: 315727
URL: https://svnweb.freebsd.org/changeset/base/315727

Log:
  Avoid double-closing an fd if elf_begin() fails.
  
  Reported by:	Miles Ohlrich <miles.ohlrich@isilon.com>
  MFC after:	1 week
  Sponsored by:	Dell EMC Isilon

Modified:
  head/lib/librtld_db/rtld_db.c

Modified: head/lib/librtld_db/rtld_db.c
==============================================================================
--- head/lib/librtld_db/rtld_db.c	Wed Mar 22 18:13:14 2017	(r315726)
+++ head/lib/librtld_db/rtld_db.c	Wed Mar 22 18:14:55 2017	(r315727)
@@ -275,10 +275,8 @@ rtld_syms(rd_agent_t *rdap, const char *
 	if (elf_version(EV_CURRENT) == EV_NONE)
 		goto err;
 	e = elf_begin(fd, ELF_C_READ, NULL);
-	if (e == NULL) {
-		close(fd);
+	if (e == NULL)
 		goto err;
-	}
 
 	scn = NULL;
 	while ((scn = elf_nextscn(e, scn)) != NULL) {