[binutils-gdb] bfd: Munmap readonly memory after bfd_free_cached_info
H.J. Lu
hjl@sourceware.org
Fri Apr 5 01:53:28 GMT 2024
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=37eac4810b66f165ed5bb837ac36c0eb9baba727
commit 37eac4810b66f165ed5bb837ac36c0eb9baba727
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Thu Apr 4 18:05:57 2024 -0700
bfd: Munmap readonly memory after bfd_free_cached_info
Munmap readonly memory after bfd_free_cached_info which may use munmapped
readonly memory.
PR ld/31608
* opncls.c (_bfd_delete_bfd): Munmap readonly memory after
bfd_free_cached_info.
Diff:
---
bfd/opncls.c | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/bfd/opncls.c b/bfd/opncls.c
index 5efec37175e..2f8a3a6c919 100644
--- a/bfd/opncls.c
+++ b/bfd/opncls.c
@@ -172,16 +172,6 @@ _bfd_delete_bfd (bfd *abfd)
munmap (elf_section_data (sec)->contents_addr,
elf_section_data (sec)->contents_size);
}
-
- struct bfd_mmapped *mmapped, *next;
- for (mmapped = abfd->mmapped; mmapped != NULL; mmapped = next)
- {
- struct bfd_mmapped_entry *entries = mmapped->entries;
- next = mmapped->next;
- for (unsigned int i = 0; i < mmapped->next_entry; i++)
- munmap (entries[i].addr, entries[i].size);
- munmap (mmapped, _bfd_pagesize);
- }
#endif
/* Give the target _bfd_free_cached_info a chance to free memory. */
@@ -197,6 +187,18 @@ _bfd_delete_bfd (bfd *abfd)
else
free ((char *) bfd_get_filename (abfd));
+#ifdef USE_MMAP
+ struct bfd_mmapped *mmapped, *next;
+ for (mmapped = abfd->mmapped; mmapped != NULL; mmapped = next)
+ {
+ struct bfd_mmapped_entry *entries = mmapped->entries;
+ next = mmapped->next;
+ for (unsigned int i = 0; i < mmapped->next_entry; i++)
+ munmap (entries[i].addr, entries[i].size);
+ munmap (mmapped, _bfd_pagesize);
+ }
+#endif
+
free (abfd->arelt_data);
free (abfd);
}
More information about the Binutils-cvs
mailing list