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

Check for undefined weak symbols during PLT binding on powerpc64, and do

Browse Source 
not attempt to copy NULL function descriptors. This fixes LD_BIND_NOW on
powerpc64 after r211706.

Reviewed by:	kib
This commit is contained in:
Nathan Whitehorn 2010-09-12 17:04:51 +00:00
parent 89f81c9646
commit d48dde6f68
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libexec/rtld-elf/powerpc64/reloc.c
View File

@ -405,8 +405,13 @@ reloc_jmpslots(Obj_Entry *obj)
(void *)target, basename(defobj->path));
#endif
reloc_jmpslot(where, target, defobj, obj,
(const Elf_Rel *) rela);
if (def == &sym_zero) {
/* Zero undefined weak symbols */
bzero(where, sizeof(struct funcdesc));
} else {
reloc_jmpslot(where, target, defobj, obj,
(const Elf_Rel *) rela);
}
}
obj->jmpslots_done = true;

2
libexec/rtld-elf/rtld.c
View File

@ -183,7 +183,7 @@ static Objlist list_main = /* Objects loaded at program startup */
static Objlist list_fini = /* Objects needing fini() calls */
STAILQ_HEAD_INITIALIZER(list_fini);
static Elf_Sym sym_zero; /* For resolving undefined weak refs. */
Elf_Sym sym_zero; /* For resolving undefined weak refs. */
#define GDB_STATE(s,m) r_debug.r_state = s; r_debug_state(&r_debug,m);

1
libexec/rtld-elf/rtld.h
View File

@ -261,6 +261,7 @@ extern void *xcalloc(size_t);
extern void *xmalloc(size_t);
extern char *xstrdup(const char *);
extern Elf_Addr _GLOBAL_OFFSET_TABLE_[];
extern Elf_Sym sym_zero; /* For resolving undefined weak refs. */
extern void dump_relocations (Obj_Entry *);
extern void dump_obj_relocations (Obj_Entry *);