aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorViju Vincent <vijuvince@gmail.com>2012-02-15 17:25:51 +0000
committerJoseph Myers <joseph@codesourcery.com>2012-02-15 17:25:51 +0000
commit7865d19cf68bcfb32c12fa3e7ce6a85fb4738383 (patch)
tree73ab33ea6e57044e51271152cb1b2f484962b11d
parentb991ef778a9e56dce09664f24dd35b0ae5c4b4e2 (diff)
downloadglibc-7865d19cf68bcfb32c12fa3e7ce6a85fb4738383.tar.xz
glibc-7865d19cf68bcfb32c12fa3e7ce6a85fb4738383.zip
Resolve race between dlopen and lazy binding on MIPS.
-rw-r--r--ChangeLog.mips5
-rw-r--r--sysdeps/mips/dl-trampoline.c30
2 files changed, 34 insertions, 1 deletions
diff --git a/ChangeLog.mips b/ChangeLog.mips
index ff8cfc2fdd..2a9ed6c583 100644
--- a/ChangeLog.mips
+++ b/ChangeLog.mips
@@ -1,3 +1,8 @@
+2012-02-15 Viju Vincent <vijuvince@gmail.com>
+
+ * sysdeps/mips/dl-trampoline.c (__dl_runtime_resolve): Use locking
+ around calls to _dl_lookup_symbol_x.
+
2012-02-13 Joseph Myers <joseph@codesourcery.com>
* sysdeps/unix/sysv/linux/mips/bits/inotify.h: New file.
diff --git a/sysdeps/mips/dl-trampoline.c b/sysdeps/mips/dl-trampoline.c
index 2c9414035c..c4367f7a3d 100644
--- a/sysdeps/mips/dl-trampoline.c
+++ b/sysdeps/mips/dl-trampoline.c
@@ -26,6 +26,7 @@
#include <elf.h>
#include <ldsodefs.h>
#include <dl-machine.h>
+#include <sysdep-cancel.h>
/* Get link map for callers object containing STUB_PC. */
static inline struct link_map *
@@ -153,17 +154,44 @@ __dl_runtime_resolve (ElfW(Word) sym_index,
if (version->hash != 0)
{
+ /* We need to keep the scope around so do some locking. This is
+ not necessary for objects which cannot be unloaded or when
+ we are not using any threads (yet). */
+ if (!RTLD_SINGLE_THREAD_P)
+ THREAD_GSCOPE_SET_FLAG ();
+
sym_map = _dl_lookup_symbol_x (strtab + sym->st_name, l,
&sym, l->l_scope, version,
ELF_RTYPE_CLASS_PLT, 0, 0);
+
+ /* We are done with the global scope. */
+ if (!RTLD_SINGLE_THREAD_P)
+ THREAD_GSCOPE_RESET_FLAG ();
+
break;
}
/* Fall through. */
}
case 0:
+ {
+ /* We need to keep the scope around so do some locking. This is
+ not necessary for objects which cannot be unloaded or when
+ we are not using any threads (yet). */
+ int flags = DL_LOOKUP_ADD_DEPENDENCY;
+ if (!RTLD_SINGLE_THREAD_P)
+ {
+ THREAD_GSCOPE_SET_FLAG ();
+ flags |= DL_LOOKUP_GSCOPE_LOCK;
+ }
+
sym_map = _dl_lookup_symbol_x (strtab + sym->st_name, l, &sym,
l->l_scope, 0, ELF_RTYPE_CLASS_PLT,
- DL_LOOKUP_ADD_DEPENDENCY, 0);
+ flags, 0);
+
+ /* We are done with the global scope. */
+ if (!RTLD_SINGLE_THREAD_P)
+ THREAD_GSCOPE_RESET_FLAG ();
+ }
}
/* Currently value contains the base load address of the object