From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: multipart/mixed; boundary="===============2158739828385395139==" MIME-Version: 1.0 From: Mark Wielaard To: elfutils-devel@lists.fedorahosted.org Subject: [PATCH] libdwfl: Don't leak fd on error in linux-proc-maps.c (grovel_auxv). Date: Thu, 15 May 2014 16:58:09 +0200 Message-ID: <1400165889-19420-1-git-send-email-mjw@redhat.com> --===============2158739828385395139== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Signed-off-by: Mark Wielaard --- libdwfl/ChangeLog | 4 ++++ libdwfl/linux-proc-maps.c | 6 +++++- 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/libdwfl/ChangeLog b/libdwfl/ChangeLog index 2cf0752..2fd2a1a 100644 --- a/libdwfl/ChangeLog +++ b/libdwfl/ChangeLog @@ -1,3 +1,7 @@ +2014-05-15 Mark Wielaard + + * linux-proc-maps.c (grovel_auxv): Close fd on error. + 2014-05-02 Mark Wielaard = * 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 b6620ac..d085834 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 =3D=3D sizeof d.a32); nread =3D pread_retry (fd, d.a64, sizeof d.a64, offset); if (nread < 0) - return errno; + { + int ret =3D errno; + close (fd); + return ret; + } for (size_t a32i =3D 0; a32i < nread / sizeof d.a32[0]; a32i++) { const Elf32_auxv_t *a32 =3D d.a32 + a32i; -- = 1.7.1 --===============2158739828385395139==--