diff options
| author | Alan Modra <amodra@gmail.com> | 2016-12-28 17:04:15 +1030 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2016-12-28 22:10:38 +1030 |
| commit | 9acc85a62eb76c270724bba15c889d2d05567b6a (patch) | |
| tree | 2f98cec208e57b60f245c4eac6bb4b71274d73e8 /bfd | |
| parent | b733bcb7f58c42e0e0d94a3f266a4193030e5f3a (diff) | |
| download | fsf-binutils-gdb-9acc85a62eb76c270724bba15c889d2d05567b6a.zip fsf-binutils-gdb-9acc85a62eb76c270724bba15c889d2d05567b6a.tar.gz fsf-binutils-gdb-9acc85a62eb76c270724bba15c889d2d05567b6a.tar.bz2 | |
Use dynrelro for symbols in relro sections too
PR ld/20995
bfd/
* elflink.c (elf_link_add_object_symbols): Mark relro sections
in dynamic objects SEC_READONLY.
ld/
* testsuite/ld-elf/pr20995c.s: New test file.
* testsuite/ld-elf/pr20995-2so.r: Likewise.
* testsuite/ld-elf/elf.exp: Run it.
Diffstat (limited to 'bfd')
| -rw-r--r-- | bfd/ChangeLog | 6 | ||||
| -rw-r--r-- | bfd/elflink.c | 16 |
2 files changed, 22 insertions, 0 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 4d7bd77..d1b012f 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,9 @@ +2016-12-28 Alan Modra <amodra@gmail.com> + + PR ld/20995 + * elflink.c (elf_link_add_object_symbols): Mark relro sections + in dynamic objects SEC_READONLY. + 2016-12-26 Alan Modra <amodra@gmail.com> PR ld/20995 diff --git a/bfd/elflink.c b/bfd/elflink.c index d8d40f1..2fd8883 100644 --- a/bfd/elflink.c +++ b/bfd/elflink.c @@ -3819,6 +3819,7 @@ elf_link_add_object_symbols (bfd *abfd, struct bfd_link_info *info) const char *soname = NULL; char *audit = NULL; struct bfd_link_needed_list *rpath = NULL, *runpath = NULL; + const Elf_Internal_Phdr *phdr; int ret; /* ld --just-symbols and dynamic objects don't mix very well. @@ -3968,6 +3969,21 @@ error_free_dyn: *pn = rpath; } + /* If we have a PT_GNU_RELRO program header, mark as read-only + all sections contained fully therein. This makes relro + shared library sections appear as they will at run-time. */ + phdr = elf_tdata (abfd)->phdr + elf_elfheader (abfd)->e_phnum; + while (--phdr >= elf_tdata (abfd)->phdr) + if (phdr->p_type == PT_GNU_RELRO) + { + for (s = abfd->sections; s != NULL; s = s->next) + if ((s->flags & SEC_ALLOC) != 0 + && s->vma >= phdr->p_vaddr + && s->vma + s->size <= phdr->p_vaddr + phdr->p_memsz) + s->flags |= SEC_READONLY; + break; + } + /* We do not want to include any of the sections in a dynamic object in the output file. We hack by simply clobbering the list of sections in the BFD. This could be handled more |