diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2013-12-12 10:35:47 -0800 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2014-01-08 05:57:21 -0800 |
| commit | 43a8475ca01b676fb764aaed0c4ed1cc16fc3c87 (patch) | |
| tree | fa782701a2a7bfcba6852cb7d9b51bb8d7650fd0 /ld/ldlang.c | |
| parent | 221fd5d598e7dcf7b953150986a501b462b99891 (diff) | |
| download | fsf-binutils-gdb-43a8475ca01b676fb764aaed0c4ed1cc16fc3c87.zip fsf-binutils-gdb-43a8475ca01b676fb764aaed0c4ed1cc16fc3c87.tar.gz fsf-binutils-gdb-43a8475ca01b676fb764aaed0c4ed1cc16fc3c87.tar.bz2 | |
Adjust LOAD segment to generate GNU_RELRO segment
This patch fixes 2 GNU_RELRO segment bugs:
1. lang_size_sections didn't properly align base to the maximum
alignment power of sections between DATA_SEGMENT_ALIGN and
DATA_SEGMENT_RELRO_END.
2. ld failed to adjust LOAD segment to generate GNU_RELRO segment
when LOAD segment doesn't fit GNU_RELRO segment. This is
https://sourceware.org/bugzilla/show_bug.cgi?id=14207
We "fixed" ld by not generating GNU_RELRO segment. This patch
adjusts LOAD segment to generate GNU_RELRO segment. It fixes
PR ld/16322 and at the same time it also fixes PR binutils/16323
since now we can adjust LOAD segment if it is too small.
bfd/
PR ld/14207
PR ld/16322
PR binutils/16323
* elf.c (_bfd_elf_map_sections_to_segments): Don't check section
size for PT_GNU_RELRO segment.
(assign_file_positions_for_load_sections): If PT_LOAD segment
doesn't fit PT_GNU_RELRO segment, adjust its p_filesz and p_memsz.
ld/
PR ld/14207
PR ld/16322
PR binutils/16323
* ldlang.c (lang_size_sections): Properly align RELRO base.
ld/testsuite/
PR ld/14207
PR ld/16322
PR binutils/16323
* ld-elf/pr16322.d: New file.
* ld-elf/pr16322.s: Likewise.
* ld-x86-64/pr14207.d: Expect PT_GNU_RELRO segment.
Diffstat (limited to 'ld/ldlang.c')
| -rw-r--r-- | ld/ldlang.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ld/ldlang.c b/ld/ldlang.c index ba7f493..7851615 100644 --- a/ld/ldlang.c +++ b/ld/ldlang.c @@ -5407,7 +5407,8 @@ lang_size_sections (bfd_boolean *relax, bfd_boolean check_regions) { if (expld.dataseg.base - (1 << max_alignment_power) < old_base) expld.dataseg.base += expld.dataseg.pagesize; - expld.dataseg.base -= (1 << max_alignment_power); + /* Properly align base to max_alignment_power. */ + expld.dataseg.base &= ~((1 << max_alignment_power) - 1); lang_reset_memory_regions (); one_lang_size_sections_pass (relax, check_regions); } |