diff options
author | kib <kib@FreeBSD.org> | 2017-02-24 11:07:49 +0000 |
---|---|---|
committer | kib <kib@FreeBSD.org> | 2017-02-24 11:07:49 +0000 |
commit | 0de9168a4c22f52771eb7bcee3afdda0c5ae5f07 (patch) | |
tree | 3aa01777d73743ff0d95db01193db56776e189e0 /libexec | |
parent | 8915d216d20d69016cae783b19490b34e09441e0 (diff) | |
download | FreeBSD-src-0de9168a4c22f52771eb7bcee3afdda0c5ae5f07.zip FreeBSD-src-0de9168a4c22f52771eb7bcee3afdda0c5ae5f07.tar.gz |
MFC r313494:
Handle protected symbols in rtld.
Diffstat (limited to 'libexec')
-rw-r--r-- | libexec/rtld-elf/rtld.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index 1be409b..337e584 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -3833,15 +3833,19 @@ symlook_default(SymLook *req, const Obj_Entry *refobj) donelist_init(&donelist); symlook_init_from_req(&req1, req); - /* Look first in the referencing object if linked symbolically. */ - if (refobj->symbolic && !donelist_check(&donelist, refobj)) { - res = symlook_obj(&req1, refobj); - if (res == 0) { - req->sym_out = req1.sym_out; - req->defobj_out = req1.defobj_out; - assert(req->defobj_out != NULL); - } + /* + * Look first in the referencing object if linked symbolically, + * and similarly handle protected symbols. + */ + res = symlook_obj(&req1, refobj); + if (res == 0 && (refobj->symbolic || + ELF_ST_VISIBILITY(req1.sym_out->st_other) == STV_PROTECTED)) { + req->sym_out = req1.sym_out; + req->defobj_out = req1.defobj_out; + assert(req->defobj_out != NULL); } + if (refobj->symbolic || req->defobj_out != NULL) + donelist_check(&donelist, refobj); symlook_global(req, &donelist); |