diff options
| author | jhb <jhb@FreeBSD.org> | 2016-12-01 20:36:48 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2016-12-01 20:36:48 +0000 |
| commit | c1af447a27a5017940c76dbc4a54f0adbd1a18e0 (patch) | |
| tree | db9264f64fd0e9c89149d57af1acd96e23881c5f | |
| parent | 5c1125f893de72436977a6e6cccea4cf8bea1cc6 (diff) | |
| download | FreeBSD-src-c1af447a27a5017940c76dbc4a54f0adbd1a18e0.zip FreeBSD-src-c1af447a27a5017940c76dbc4a54f0adbd1a18e0.tar.gz | |
MFC 308456: Pass the correct flag to find_symdef() from _rtld_bind().
When symbol versioning was added to rtld, the boolean 'in_plt' argument
to find_symdef() was converted to a bitmask of flags. The first flag
added was 'SYMLOOK_IN_PLT' which replaced the 'in_plt' bool. This
happened to still work by accident as SYMLOOK_IN_PLT had the value of 1
which is the same as 'true', so there should be no functional change.
| -rw-r--r-- | libexec/rtld-elf/rtld.c | 4 | ||||
| -rw-r--r-- | libexec/rtld-elf/sparc64/reloc.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index 4222c18..874f80b 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -714,8 +714,8 @@ _rtld_bind(Obj_Entry *obj, Elf_Size reloff) rel = (const Elf_Rel *) ((caddr_t) obj->pltrela + reloff); where = (Elf_Addr *) (obj->relocbase + rel->r_offset); - def = find_symdef(ELF_R_SYM(rel->r_info), obj, &defobj, true, NULL, - &lockstate); + def = find_symdef(ELF_R_SYM(rel->r_info), obj, &defobj, SYMLOOK_IN_PLT, + NULL, &lockstate); if (def == NULL) rtld_die(); if (ELF_ST_TYPE(def->st_info) == STT_GNU_IFUNC) diff --git a/libexec/rtld-elf/sparc64/reloc.c b/libexec/rtld-elf/sparc64/reloc.c index ab16879..197c66c 100644 --- a/libexec/rtld-elf/sparc64/reloc.c +++ b/libexec/rtld-elf/sparc64/reloc.c @@ -503,7 +503,7 @@ reloc_plt(Obj_Entry *obj) assert(ELF64_R_TYPE_ID(rela->r_info) == R_SPARC_JMP_SLOT); where = (Elf_Addr *)(obj->relocbase + rela->r_offset); def = find_symdef(ELF_R_SYM(rela->r_info), obj, &defobj, - true, NULL, lockstate); + SYMLOOK_IN_PLT, NULL, lockstate); value = (Elf_Addr)(defobj->relocbase + def->st_value); *where = value; } |
