OpenE2K/binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bfd_close_all_done calling _close_and_cleanup

Browse Source 
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.
This commit is contained in:
Alan Modra 2017-08-31 08:46:47 +09:30
parent e69f32654a
commit e234de6be5
2 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bfd/ChangeLog
View File

@ -1,3 +1,10 @@
2017-08-31 Alan Modra <amodra@gmail.com>
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 <hongjiu.lu@intel.com>
* elf32-i386.c (elf_i386_plt_type): Removed.

18
bfd/opncls.c
View File

@ -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);