D9317.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D9317.diff
View Options

	Index: head/libexec/rtld-elf/rtld.c
	===================================================================
	--- head/libexec/rtld-elf/rtld.c
	+++ head/libexec/rtld-elf/rtld.c
	@@ -3957,15 +3957,19 @@
	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);