qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Resolve race between dlopen and lazy binding on MIPS.

This commit is contained in:
Viju Vincent 2012-02-15 17:25:51 +00:00 committed by Joseph Myers
parent b991ef778a
commit 7865d19cf6
2 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog.mips
View File

@ -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> 2012-02-13 Joseph Myers <joseph@codesourcery.com>
* sysdeps/unix/sysv/linux/mips/bits/inotify.h: New file. * sysdeps/unix/sysv/linux/mips/bits/inotify.h: New file.

30
sysdeps/mips/dl-trampoline.c
View File

@ -26,6 +26,7 @@
#include <elf.h> #include <elf.h>
#include <ldsodefs.h> #include <ldsodefs.h>
#include <dl-machine.h> #include <dl-machine.h>
#include <sysdep-cancel.h>
/* Get link map for callers object containing STUB_PC. */ /* Get link map for callers object containing STUB_PC. */
static inline struct link_map * static inline struct link_map *
@ -153,17 +154,44 @@ __dl_runtime_resolve (ElfW(Word) sym_index,
if (version->hash != 0) 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_map = _dl_lookup_symbol_x (strtab + sym->st_name, l,
&sym, l->l_scope, version, &sym, l->l_scope, version,
ELF_RTYPE_CLASS_PLT, 0, 0); ELF_RTYPE_CLASS_PLT, 0, 0);
/* We are done with the global scope. */
if (!RTLD_SINGLE_THREAD_P)
THREAD_GSCOPE_RESET_FLAG ();
break; break;
} }
/* Fall through. */ /* Fall through. */
} }
case 0: 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, sym_map = _dl_lookup_symbol_x (strtab + sym->st_name, l, &sym,
l->l_scope, 0, ELF_RTYPE_CLASS_PLT, 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 /* Currently value contains the base load address of the object