From b90395e6e9479e06ada7294044aaa150a094150f Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Tue, 18 Sep 2007 19:20:56 +0000 Subject: * 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. --- include/link.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include/link.h') diff --git a/include/link.h b/include/link.h index ccbbb8c45e..b373eeaf59 100644 --- a/include/link.h +++ b/include/link.h @@ -286,6 +286,8 @@ struct link_map ElfW(Addr) l_relro_addr; size_t l_relro_size; + unsigned long long int l_serial; + /* Audit information. This array apparent must be the last in the structure. Never add something after it. */ struct auditstate -- cgit v1.2.3