diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | src/arch-x86_64.c | 4 | ||||
| -rw-r--r-- | src/dso.c | 19 | ||||
| -rw-r--r-- | src/prelink.h | 1 |
4 files changed, 26 insertions, 2 deletions
@@ -1,4 +1,8 @@ 2018-10-12 Sergei Trofimovich <slyfox@gentoo.org> + * src/arch-x86_64.c, src/dso.c, src/prelink.h: Allow prelink of + pie executables with COPY relocs + +2018-10-12 Sergei Trofimovich <slyfox@gentoo.org> * tessuite/functions.sh: Avoid timestamp drift 2018-10-12 Joseph Myers <joseph@codesourcery.com> diff --git a/src/arch-x86_64.c b/src/arch-x86_64.c index 5c95f47..2f6c551 100644 --- a/src/arch-x86_64.c +++ b/src/arch-x86_64.c @@ -179,7 +179,7 @@ x86_64_prelink_rela (struct prelink_info *info, GElf_Rela *rela, value + rela->r_addend - info->resolvetls->offset); break; case R_X86_64_COPY: - if (dso->ehdr.e_type == ET_EXEC) + if (dso->ehdr.e_type == ET_EXEC || dso_is_pie(dso)) /* COPY relocs are handled specially in generic code. */ return 0; error (0, 0, "%s: R_X86_64_COPY reloc in shared library?", dso->filename); @@ -503,7 +503,7 @@ x86_64_undo_prelink_rela (DSO *dso, GElf_Rela *rela, GElf_Addr relaaddr) write_le32 (dso, rela->r_offset, 0); break; case R_X86_64_COPY: - if (dso->ehdr.e_type == ET_EXEC) + if (dso->ehdr.e_type == ET_EXEC || dso_is_pie(dso)) /* COPY relocs are handled specially in generic code. */ return 0; error (0, 0, "%s: R_X86_64_COPY reloc in shared library?", dso->filename); @@ -1141,6 +1141,25 @@ adjust_old_to_new (DSO *dso, GElf_Addr addr) return addr; } +/* Return true is DSO is position independent executable. + + There is no simple way to distinct between shared library + and PIE executable. Use presence of interpreter as a heuristic. */ + +int dso_is_pie(DSO *dso) +{ + int i; + + if (dso->ehdr.e_type != ET_DYN) + return 0; + + for (i = 0; i < dso->ehdr.e_phnum; ++i) + if (dso->phdr[i].p_type == PT_INTERP) + return 1; + + return 0; +} + GElf_Addr adjust_new_to_old (DSO *dso, GElf_Addr addr) { diff --git a/src/prelink.h b/src/prelink.h index de757df..ec9b8f9 100644 --- a/src/prelink.h +++ b/src/prelink.h @@ -298,6 +298,7 @@ int reopen_dso (DSO *dso, struct section_move *move, const char *); int adjust_symbol_p (DSO *dso, GElf_Sym *sym); int check_dso (DSO *dso); int dso_is_rdwr (DSO *dso); +int dso_is_pie(DSO *dso); void read_dynamic (DSO *dso); int set_dynamic (DSO *dso, GElf_Word tag, GElf_Addr value, int fatal); int addr_to_sec (DSO *dso, GElf_Addr addr); |