diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2007-09-18 19:20:56 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2007-09-18 19:20:56 +0000 |
| commit | b90395e6e9479e06ada7294044aaa150a094150f (patch) | |
| tree | b743ab6c481685f996e700bf24dca01e61258731 /elf/dl-runtime.c | |
| parent | 874aa52349cc111d1f6ea5dff24bb14c306714e0 (diff) | |
| download | glibc-b90395e6e9479e06ada7294044aaa150a094150f.tar.gz glibc-b90395e6e9479e06ada7294044aaa150a094150f.tar.xz glibc-b90395e6e9479e06ada7294044aaa150a094150f.zip | |
* sysdeps/generic/ldsodefs.h (DL_LOOKUP_GSCOPE_LOCK): New definition.
* elf/dl-runtime.c (_dl_fixup, _dl_profile_fixup): Or in DL_LOOKUP_GSCOPE_LOCK into flags after THREAD_GSCOPE_SET_FLAG (). * elf/dl-sym.c (do_sym): Likewise. * include/link.h (struct link_map): Add l_serial field. * elf/dl-object.c (_dl_new_object): Initialize l_serial. * elf/dl-lookup.c (add_dependency): Add flags argument. Remember map->l_serial, if DL_LOOKUP_GSCOPE_LOCK is among flags, use THREAD_GSCOPE_RESET_FLAG before and THREAD_GSCOPE_SET_FLAG after __rtld_lock_lock_recursive (GL(dl_load_lock)) to avoid deadlock. Don't dereference map until it has been found on some list. If map->l_serial changed, return -1.
Diffstat (limited to 'elf/dl-runtime.c')
| -rw-r--r-- | elf/dl-runtime.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/elf/dl-runtime.c b/elf/dl-runtime.c index ee2b8b5f6c..968e293409 100644 --- a/elf/dl-runtime.c +++ b/elf/dl-runtime.c @@ -100,7 +100,10 @@ _dl_fixup ( we are not using any threads (yet). */ int flags = DL_LOOKUP_ADD_DEPENDENCY; if (!RTLD_SINGLE_THREAD_P) - THREAD_GSCOPE_SET_FLAG (); + { + THREAD_GSCOPE_SET_FLAG (); + flags |= DL_LOOKUP_GSCOPE_LOCK; + } result = _dl_lookup_symbol_x (strtab + sym->st_name, l, &sym, l->l_scope, version, ELF_RTYPE_CLASS_PLT, flags, NULL); @@ -192,7 +195,10 @@ _dl_profile_fixup ( we are not using any threads (yet). */ int flags = DL_LOOKUP_ADD_DEPENDENCY; if (!RTLD_SINGLE_THREAD_P) - THREAD_GSCOPE_SET_FLAG (); + { + THREAD_GSCOPE_SET_FLAG (); + flags |= DL_LOOKUP_GSCOPE_LOCK; + } result = _dl_lookup_symbol_x (strtab + refsym->st_name, l, &defsym, l->l_scope, version, |