summaryrefslogtreecommitdiff
path: root/elf
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2009-07-23 07:07:53 -0700
committerUlrich Drepper <drepper@redhat.com>2009-07-23 07:07:53 -0700
commit802fe9a1ca0577e8eac28c31a8c20497b15e7e69 (patch)
tree9a9b5daed16d5797ce46aaef6513aa598e6f9790 /elf
parent0122f28eb99351c1b1690d5e2613988452d04583 (diff)
downloadglibc-802fe9a1ca0577e8eac28c31a8c20497b15e7e69.tar.gz
Handle unloading of DSO with a unique symbol definition.
Diffstat (limited to 'elf')
-rw-r--r--elf/dl-lookup.c11
-rw-r--r--elf/tst-unique1.c42
2 files changed, 48 insertions, 5 deletions
diff --git a/elf/dl-lookup.c b/elf/dl-lookup.c
index fd0d624430..bdc84afa56 100644
--- a/elf/dl-lookup.c
+++ b/elf/dl-lookup.c
@@ -312,7 +312,7 @@ do_lookup_x (const char *undef_name, uint_fast32_t new_hash,
definition we have to use it. */
void enter (struct unique_sym *table, size_t size,
unsigned int hash, const char *name,
- const ElfW(Sym) *sym, const struct link_map *map)
+ const ElfW(Sym) *sym, struct link_map *map)
{
size_t idx = hash % size;
size_t hash2 = 1 + hash % (size - 2);
@@ -332,6 +332,12 @@ do_lookup_x (const char *undef_name, uint_fast32_t new_hash,
table[idx].sym = sym;
table[idx].map = map;
}
+
+ if (table[idx].map->l_type == lt_loaded)
+ /* Make sure we don't unload this object by
+ artificially increason the open count. */
+ ++table[idx].map->l_direct_opencount;
+
return;
}
@@ -410,7 +416,8 @@ do_lookup_x (const char *undef_name, uint_fast32_t new_hash,
tab->free = free;
}
- enter (entries, size, new_hash, strtab + sym->st_name, sym, map);
+ enter (entries, size, new_hash, strtab + sym->st_name, sym,
+ (struct link_map *) map);
++tab->n_elements;
__rtld_lock_unlock_recursive (tab->lock);
diff --git a/elf/tst-unique1.c b/elf/tst-unique1.c
index 9b7996cd96..46d41d9ff4 100644
--- a/elf/tst-unique1.c
+++ b/elf/tst-unique1.c
@@ -1,6 +1,7 @@
#include <config.h>
#include <dlfcn.h>
#include <stdio.h>
+#include <sys/mman.h>
static int
do_test (void)
@@ -30,10 +31,45 @@ do_test (void)
puts ("cannot locate f in tst-unique1mod2");
return 1;
}
- return f2 (f1 ());
-#else
- return 0;
+ if (f2 (f1 ()))
+ {
+ puts ("f from tst-unique1mod2 failed");
+ return 1;
+ }
+ dlclose (h2);
+ dlclose (h1);
+ mmap (NULL, 1024 * 1024 * 16, PROT_NONE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+ h2 = dlopen ("tst-unique1mod2.so", RTLD_LAZY);
+ if (h2 == NULL)
+ {
+ puts ("cannot load tst-unique1mod2");
+ return 1;
+ }
+ f2 = dlsym (h2, "f");
+ if (f2 == NULL)
+ {
+ puts ("cannot locate f in tst-unique1mod2");
+ return 1;
+ }
+ h1 = dlopen ("tst-unique1mod1.so", RTLD_LAZY);
+ if (h1 == NULL)
+ {
+ puts ("cannot load tst-unique1mod1");
+ return 1;
+ }
+ f1 = dlsym (h1, "f");
+ if (f1 == NULL)
+ {
+ puts ("cannot locate f in tst-unique1mod1");
+ return 1;
+ }
+ if (f2 (f1 ()))
+ {
+ puts ("f from tst-unique1mod2 failed");
+ return 1;
+ }
#endif
+ return 0;
}
#define TEST_FUNCTION do_test ()