svn commit: r315727 - head/lib/librtld_db

Mark Johnston markj at FreeBSD.org
Wed Mar 22 18:14:57 UTC 2017


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 at 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) {


More information about the svn-src-head mailing list