summaryrefslogtreecommitdiff
path: root/bfd/merge.c
diff options
context:
space:
mode:
authorAlan Modra <amodra@gmail.com>2018-10-23 18:29:24 +1030
committerAlan Modra <amodra@gmail.com>2018-10-23 21:09:09 +1030
commitab419ddbb2cdd17ca83618990f2cacf904ce1d61 (patch)
tree22f6defa1dee801d2e582c4922d33a7a0dc017ca /bfd/merge.c
parent8e3152af14a91df65af8e922a0e8e77c60ed99ba (diff)
downloadbinutils-gdb-ab419ddbb2cdd17ca83618990f2cacf904ce1d61.tar.gz
PR23804, buffer overflow in sec_merge_hash_lookup
PR 23804 * merge.c (_bfd_add_merge_section): Don't attempt to merge sections where size is not a multiple of entsize.
Diffstat (limited to 'bfd/merge.c')
-rw-r--r--bfd/merge.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/bfd/merge.c b/bfd/merge.c
index 79045529427..5e3bba09825 100644
--- a/bfd/merge.c
+++ b/bfd/merge.c
@@ -376,6 +376,9 @@ _bfd_add_merge_section (bfd *abfd, void **psinfo, asection *sec,
|| sec->entsize == 0)
return TRUE;
+ if (sec->size % sec->entsize != 0)
+ return TRUE;
+
if ((sec->flags & SEC_RELOC) != 0)
{
/* We aren't prepared to handle relocations in merged sections. */