From e234de6be5cc96286e0efb90e8d9fce51239e901 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Thu, 31 Aug 2017 08:46:47 +0930 Subject: [PATCH] bfd_close_all_done calling _close_and_cleanup elf64_vms_close_and_cleanup calls bfd_get_size, which calls iovec->bstat. cache_bstat ends up adding the bfd to the cache lru list, negating the bfd_cache_close call in bfd_close_all_done. So there is a dangling pointer into the freed and then reused bfd. Thus, bfd_cache_close must be called after _close_and_cleanup, or better, via iovec->bclose. PR binutils/22032 * opncls.c (bfd_close_all_done): Don't call bfd_cache_close before _close_and_cleanup. Call iovec->bclose after. (bfd_close): Remove code common to, and call, bfd_close_all_done. --- bfd/ChangeLog | 7 +++++++ bfd/opncls.c | 18 +++--------------- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index bda958a83fd..52a88f8d427 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,10 @@ +2017-08-31 Alan Modra + + PR binutils/22032 + * opncls.c (bfd_close_all_done): Don't call bfd_cache_close + before _close_and_cleanup. Call iovec->bclose after. + (bfd_close): Remove code common to, and call, bfd_close_all_done. + 2017-08-30 H.J. Lu * elf32-i386.c (elf_i386_plt_type): Removed. diff --git a/bfd/opncls.c b/bfd/opncls.c index b99ae728c07..fa549868544 100644 --- a/bfd/opncls.c +++ b/bfd/opncls.c @@ -726,25 +726,13 @@ RETURNS bfd_boolean bfd_close (bfd *abfd) { - bfd_boolean ret; - if (bfd_write_p (abfd)) { if (! BFD_SEND_FMT (abfd, _bfd_write_contents, (abfd))) return FALSE; } - if (! BFD_SEND (abfd, _close_and_cleanup, (abfd))) - return FALSE; - - ret = abfd->iovec->bclose (abfd) == 0; - - if (ret) - _maybe_make_executable (abfd); - - _bfd_delete_bfd (abfd); - - return ret; + return bfd_close_all_done (abfd); } /* @@ -774,11 +762,11 @@ bfd_close_all_done (bfd *abfd) { bfd_boolean ret; - ret = bfd_cache_close (abfd); - if (! BFD_SEND (abfd, _close_and_cleanup, (abfd))) return FALSE; + ret = abfd->iovec->bclose (abfd) == 0; + if (ret) _maybe_make_executable (abfd); -- 2.30.2