Browse Source

Added test for RTLD_GLOBAL flag in _dl_find_hash().
Fixed a bug in libdl.c where the RTLD_GLOBAL was assigned
wronly.

Joakim Tjernlund 21 years ago
parent
commit
ee55de4929
2 changed files with 5 additions and 2 deletions
  1. 2 0
      ldso/ldso/dl-hash.c
  2. 3 2
      ldso/libdl/libdl.c

+ 2 - 0
ldso/ldso/dl-hash.c

@@ -173,6 +173,8 @@ char *_dl_find_hash(const char *name, struct dyn_elf *rpnt, int type_class)
 	for (; rpnt; rpnt = rpnt->next) {
 	for (; rpnt; rpnt = rpnt->next) {
 		tpnt = rpnt->dyn;
 		tpnt = rpnt->dyn;
 
 
+		if (!(tpnt->rtld_flags & RTLD_GLOBAL))
+			continue;
 		/* Don't search the executable when resolving a copy reloc. */
 		/* Don't search the executable when resolving a copy reloc. */
 		if ((type_class &  ELF_RTYPE_CLASS_COPY) && tpnt->libtype == elf_executable)
 		if ((type_class &  ELF_RTYPE_CLASS_COPY) && tpnt->libtype == elf_executable)
 			continue;
 			continue;

+ 3 - 2
ldso/libdl/libdl.c

@@ -223,13 +223,14 @@ void *dlopen(const char *libname, int flag)
 				_dl_memset (dyn_ptr->next, 0, sizeof (struct dyn_elf));
 				_dl_memset (dyn_ptr->next, 0, sizeof (struct dyn_elf));
 				dyn_ptr = dyn_ptr->next;
 				dyn_ptr = dyn_ptr->next;
 				dyn_ptr->dyn = tpnt1;
 				dyn_ptr->dyn = tpnt1;
-				tpnt->rtld_flags |= RTLD_GLOBAL;
 				if (!tpnt1) {
 				if (!tpnt1) {
 					tpnt1 = _dl_load_shared_library(0, &rpnt, tcurr, lpntstr, 0);
 					tpnt1 = _dl_load_shared_library(0, &rpnt, tcurr, lpntstr, 0);
+					dyn_ptr->dyn = tpnt1;
 					if (!tpnt1)
 					if (!tpnt1)
 						goto oops;
 						goto oops;
-					dyn_ptr->dyn = tpnt1;
+					tpnt1->rtld_flags |= RTLD_GLOBAL;
 				} else {
 				} else {
+					tpnt1->rtld_flags |= RTLD_GLOBAL;
 					tpnt1->usage_count++;
 					tpnt1->usage_count++;
 				}
 				}
 			}
 			}