From: Mark Wielaard <mjw@redhat.com>
Date: Thu, 15 May 2014 14:03:59 +0000 (+0200)
Subject: libdwfl: Don't leak fd on error in linux-proc-maps.c (grovel_auxv).
X-Git-Tag: elfutils-0.159~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0f5b632a72bf0a33e3f2ec9270dd16d266a7b54b;p=thirdparty%2Felfutils.git

libdwfl: Don't leak fd on error in linux-proc-maps.c (grovel_auxv).

Signed-off-by: Mark Wielaard <mjw@redhat.com>
---

diff --git a/libdwfl/ChangeLog b/libdwfl/ChangeLog
index 2cf075212..2fd2a1a35 100644
--- a/libdwfl/ChangeLog
+++ b/libdwfl/ChangeLog
@@ -1,3 +1,7 @@
+2014-05-15  Mark Wielaard  <mjw@redhat.com>
+
+	* linux-proc-maps.c (grovel_auxv): Close fd on error.
+
 2014-05-02  Mark Wielaard  <mjw@redhat.com>
 
 	* dwfl_module_getdwarf: Remove ENABLE_DWZ ifdefs so find_debug_altlink
diff --git a/libdwfl/linux-proc-maps.c b/libdwfl/linux-proc-maps.c
index b6620ac55..d08583420 100644
--- a/libdwfl/linux-proc-maps.c
+++ b/libdwfl/linux-proc-maps.c
@@ -116,7 +116,11 @@ grovel_auxv (pid_t pid, Dwfl *dwfl, GElf_Addr *sysinfo_ehdr)
       eu_static_assert (sizeof d.a64 == sizeof d.a32);
       nread = pread_retry (fd, d.a64, sizeof d.a64, offset);
       if (nread < 0)
-	return errno;
+	{
+	  int ret = errno;
+	  close (fd);
+	  return ret;
+	}
       for (size_t a32i = 0; a32i < nread / sizeof d.a32[0]; a32i++)
 	{
 	  const Elf32_auxv_t *a32 = d.a32 + a32i;