diff options
| author | Mark Wielaard <mjw@redhat.com> | 2014-05-15 16:03:59 +0200 |
|---|---|---|
| committer | Mark Wielaard <mjw@redhat.com> | 2014-05-15 16:03:59 +0200 |
| commit | 0f5b632a72bf0a33e3f2ec9270dd16d266a7b54b (patch) | |
| tree | d00494bd88a2c75c744b08c976dca97415bd4fb2 | |
| parent | bb096d0412f2cb71e7cac628fc7e251a47c1a56e (diff) | |
| download | android_external_elfutils-0f5b632a72bf0a33e3f2ec9270dd16d266a7b54b.tar.gz android_external_elfutils-0f5b632a72bf0a33e3f2ec9270dd16d266a7b54b.tar.bz2 android_external_elfutils-0f5b632a72bf0a33e3f2ec9270dd16d266a7b54b.zip | |
libdwfl: Don't leak fd on error in linux-proc-maps.c (grovel_auxv).
Signed-off-by: Mark Wielaard <mjw@redhat.com>
| -rw-r--r-- | libdwfl/ChangeLog | 4 | ||||
| -rw-r--r-- | libdwfl/linux-proc-maps.c | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/libdwfl/ChangeLog b/libdwfl/ChangeLog index 2cf07521..2fd2a1a3 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 b6620ac5..d0858342 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; |