diff options
| author | Kurt Miller <kurt@cvs.openbsd.org> | 2014-12-24 14:04:10 +0000 |
|---|---|---|
| committer | Kurt Miller <kurt@cvs.openbsd.org> | 2014-12-24 14:04:10 +0000 |
| commit | 247a5c763d36a898360d28b86187cff9fc62a121 (patch) | |
| tree | 51f69bb6c7713b5b41ec427a58e57dad643a926a /lib | |
| parent | ef7e97c0c41d52b29afb0c8535769d358c80e357 (diff) | |
Expand Elf_Rel relocations to include DT_JMPREL. Inspect DT_PLTREL value
to determine if DT_JMPREL relocations are REL or RELA and conditionally
perform DT_JMPREL in either REL or RELA as needed (idea from kettenis@).
Remove unneeded i386 RELA implementation. i386 static pie working now.
okay kettenis@
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/csu/boot.h | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/lib/csu/boot.h b/lib/csu/boot.h index 068805bf194..177f8016bff 100644 --- a/lib/csu/boot.h +++ b/lib/csu/boot.h @@ -1,4 +1,4 @@ -/* $OpenBSD: boot.h,v 1.5 2014/12/24 08:58:46 kettenis Exp $ */ +/* $OpenBSD: boot.h,v 1.6 2014/12/24 14:04:09 kurt Exp $ */ /* * Copyright (c) 1998 Per Fogelstrom, Opsycon AB @@ -159,27 +159,40 @@ _dl_boot_bind(const long sp, long *dl_data, Elf_Dyn *dynamicp) table[i++] = DT_FINI; table[i++] = DT_REL; table[i++] = DT_JMPREL; + table[i++] = DT_PLTREL; /* other processors insert their extras here */ table[i++] = DT_NULL; for (i = 0; table[i] != DT_NULL; i++) { val = table[i]; if (val >= DT_LOPROC && val < DT_LOPROC + DT_PROCNUM) val = val - DT_LOPROC + DT_NUM; - else if (val >= DT_NUM) + else if (val >= DT_NUM || val == DT_PLTREL) continue; if (dynld.Dyn.info[val] != 0) dynld.Dyn.info[val] += loff; } } - { + for (n = 0; n < 2; n++) { u_int32_t rs; Elf_Rel *rp; int i; - rp = (Elf_Rel *)(dynld.Dyn.info[DT_REL]); - rs = dynld.dyn.relsz; - + switch (n) { + case 0: + if (dynld.Dyn.info[DT_PLTREL] != DT_REL) + continue; + rp = (Elf_Rel *)(dynld.Dyn.info[DT_JMPREL]); + rs = dynld.dyn.pltrelsz; + break; + case 1: + rp = (Elf_Rel *)(dynld.Dyn.info[DT_REL]); + rs = dynld.dyn.relsz; + break; + default: + rp = NULL; + rs = 0; + } for (i = 0; i < rs; i += sizeof (Elf_Rel), rp++) { Elf_Addr *ra; const Elf_Sym *sp; @@ -214,6 +227,8 @@ _dl_boot_bind(const long sp, long *dl_data, Elf_Dyn *dynamicp) switch (n) { case 0: + if (dynld.Dyn.info[DT_PLTREL] != DT_RELA) + continue; rp = (Elf_RelA *)(dynld.Dyn.info[DT_JMPREL]); rs = dynld.dyn.pltrelsz; break; |