d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tidy up arm64 reloc_jmpslots() implementation.

Browse Source 
- don't relocate jump slots multiple times (if LD_BIND_NOW is defined).
- process only R_AARCH64_JUMP_SLOT here, other relocation types are handled
  by reloc_plt().

MFC after:	1 week
This commit is contained in:
Michal Meloun 2018-12-05 10:30:53 +00:00
parent 22e9ff95aa
commit 419333b944
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libexec/rtld-elf/aarch64/reloc.c
View File

@ -243,7 +243,9 @@ reloc_jmpslots(Obj_Entry *obj, int flags, RtldLockState *lockstate)
const Elf_Rela *relalim;
const Elf_Rela *rela;
const Elf_Sym *def;
struct tls_data *tlsdesc;
if (obj->jmpslots_done)
return (0);
relalim = (const Elf_Rela *)((const char *)obj->pltrela +
obj->pltrelasize);
@ -265,20 +267,9 @@ reloc_jmpslots(Obj_Entry *obj, int flags, RtldLockState *lockstate)
reloc_jmpslot(where, target, defobj, obj,
(const Elf_Rel *)rela);
break;
case R_AARCH64_TLSDESC:
if (ELF_R_SYM(rela->r_info) != 0) {
tlsdesc = (struct tls_data *)where[1];
if (tlsdesc->index == -1)
rtld_tlsdesc_handle_locked(tlsdesc,
SYMLOOK_IN_PLT | flags, lockstate);
}
break;
default:
_rtld_error("Unknown relocation type %x in jmpslot",
(unsigned int)ELF_R_TYPE(rela->r_info));
return (-1);
}
}
obj->jmpslots_done = true;
return (0);
}