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/testsuite | |
| 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/testsuite')
| -rw-r--r-- | ld/testsuite/ChangeLog | 10 | ||||
| -rw-r--r-- | ld/testsuite/ld-elf/pr16322.d | 7 | ||||
| -rw-r--r-- | ld/testsuite/ld-elf/pr16322.s | 6 | ||||
| -rw-r--r-- | ld/testsuite/ld-x86-64/pr14207.d | 23 |
4 files changed, 42 insertions, 4 deletions
diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index dfe7d09..8d32d28 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,3 +1,13 @@ +2014-01-08 H.J. Lu <hongjiu.lu@intel.com> + + 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. + For older changes see ChangeLog-2013 Copyright (C) 2014 Free Software Foundation, Inc. diff --git a/ld/testsuite/ld-elf/pr16322.d b/ld/testsuite/ld-elf/pr16322.d new file mode 100644 index 0000000..40a7975 --- /dev/null +++ b/ld/testsuite/ld-elf/pr16322.d @@ -0,0 +1,7 @@ +#ld: -shared -z relro +#readelf: -l --wide +#target: *-*-linux-gnu *-*-gnu* *-*-nacl* + +#... + GNU_RELRO .* +#pass diff --git a/ld/testsuite/ld-elf/pr16322.s b/ld/testsuite/ld-elf/pr16322.s new file mode 100644 index 0000000..c95817a --- /dev/null +++ b/ld/testsuite/ld-elf/pr16322.s @@ -0,0 +1,6 @@ + .globl p1 + .section .data.rel.ro,"aw",%progbits + .p2align 5 + .type p1, %object +p1: + .dc.a f1 diff --git a/ld/testsuite/ld-x86-64/pr14207.d b/ld/testsuite/ld-x86-64/pr14207.d index 2362e88..b1e2d5a 100644 --- a/ld/testsuite/ld-x86-64/pr14207.d +++ b/ld/testsuite/ld-x86-64/pr14207.d @@ -2,8 +2,23 @@ #as: --64 #ld: -melf_x86_64 -shared -z relro -z now #readelf: -l --wide +#target: x86_64-*-linux* -#failif -#... - NULL +.* -#... +Elf file type is DYN \(Shared object file\) +Entry point 0x1d9 +There are 4 program headers, starting at offset 64 + +Program Headers: + Type Offset VirtAddr PhysAddr FileSiz MemSiz Flg Align + LOAD 0x000000 0x0000000000000000 0x0000000000000000 0x0001e0 0x0001e0 R 0x200000 + LOAD 0x000b48 0x0000000000200b48 0x0000000000200b48 0x0004b8 0x000cf8 RW 0x200000 + DYNAMIC 0x000b90 0x0000000000200b90 0x0000000000200b90 0x0001c0 0x0001c0 RW 0x8 + GNU_RELRO 0x000b48 0x0000000000200b48 0x0000000000200b48 0x0004b8 0x0004b8 R 0x1 + + Section to Segment mapping: + Segment Sections... + 00 .hash .dynsym .dynstr + 01 .init_array .fini_array .jcr .data.rel.ro .dynamic .got .bss + 02 .dynamic + 03 .init_array .fini_array .jcr .data.rel.ro .dynamic .got +#pass |