diff options
| -rw-r--r-- | bfd/ChangeLog | 5 | ||||
| -rw-r--r-- | bfd/elf.c | 16 |
2 files changed, 16 insertions, 5 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 37bc1c60f3c..41a60ffb397 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,6 +1,11 @@ 2020-01-29 Alan Modra <amodra@gmail.com> Apply from master + 2020-01-23 Alan Modra <amodra@gmail.com> + PR 25444 + * elf.c (assign_file_positions_for_load_sections): Avoid divide + by zero when p_align is zero. + 2020-01-22 Alan Modra <amodra@gmail.com> * elf64-ppc.c (ppc64_elf_size_stubs): Correct condition under which __tls_get_addr calls will be eliminated. diff --git a/bfd/elf.c b/bfd/elf.c index 08aaab644a8..a8d98a60f4e 100644 --- a/bfd/elf.c +++ b/bfd/elf.c @@ -5755,11 +5755,17 @@ assign_file_positions_for_load_sections (bfd *abfd, { p->p_offset = off; if (no_contents) - /* Put meaningless p_offset for PT_LOAD segments - without file contents somewhere within the first - page, in an attempt to not point past EOF. */ - p->p_offset = off % (p->p_align > maxpagesize - ? p->p_align : maxpagesize); + { + /* Put meaningless p_offset for PT_LOAD segments + without file contents somewhere within the first + page, in an attempt to not point past EOF. */ + bfd_size_type align = maxpagesize; + if (align < p->p_align) + align = p->p_align; + if (align < 1) + align = 1; + p->p_offset = off % align; + } } else { |