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

When looking up the symbol by dlsym, look it not only in the object

Browse Source 
given as dso handle, but also in the implicit dependencies of that dso.

Also, const-ify the read-only parameter objlist of symlook_list.

Reported by:	"Simon 'corecode' Schubert" <corecode at fs ei tum de>
Approved by:	kan (mentor)
X-MFC-After:	6.2
This commit is contained in:
Konstantin Belousov 2006-09-08 14:59:54 +00:00
parent 590fd053c0
commit d0cb0064fe
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=162156
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -123,7 +123,7 @@ static const void **get_program_var_addr(const char *);
static void set_program_var(const char *, const void *);
static const Elf_Sym *symlook_default(const char *, unsigned long,
const Obj_Entry *, const Obj_Entry **, const Ver_Entry *, int);
static const Elf_Sym *symlook_list(const char *, unsigned long, Objlist *,
static const Elf_Sym *symlook_list(const char *, unsigned long, const Objlist *,
const Obj_Entry **, const Ver_Entry *, int flags, DoneList *);
static void trace_loaded_objects(Obj_Entry *obj);
static void unlink_object(Obj_Entry *);
@ -1851,21 +1851,18 @@ do_dlsym(void *handle, const char *name, void *retaddr, const Ver_Entry *ve,
return NULL;
}
DoneList donelist;
const Objlist *srch_list;
donelist_init(&donelist);
if (obj->mainprog) {
DoneList donelist;
/* Search main program and all libraries loaded by it. */
donelist_init(&donelist);
def = symlook_list(name, hash, &list_main, &defobj, ve, flags,
&donelist);
srch_list = &list_main;
} else {
/*
* XXX - This isn't correct. The search should include the whole
* DAG rooted at the given object.
*/
def = symlook_obj(name, hash, obj, ve, flags);
defobj = obj;
/* Search the whole DAG rooted at the given object. */
srch_list = &(obj->dagmembers);
}
def = symlook_list(name, hash, srch_list, &defobj, ve, flags,
&donelist);
}
if (def != NULL) {
@ -2336,7 +2333,7 @@ symlook_default(const char *name, unsigned long hash, const Obj_Entry *refobj,
}
static const Elf_Sym *
symlook_list(const char *name, unsigned long hash, Objlist *objlist,
symlook_list(const char *name, unsigned long hash, const Objlist *objlist,
const Obj_Entry **defobj_out, const Ver_Entry *ventry, int flags,
DoneList *dlp)
{