From 2430d57a13f4f10312e13c58962cd9104e6428fd Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Thu, 17 Oct 2002 12:10:17 +0000 Subject: * elf/dl-load.c (_dl_map_object_from_fd): Don't check DF_STATIC_TLS. * elf/dl-reloc.c (_dl_relocate_object: CHECK_STATIC_TLS): New macro to signal error if an IE-model TLS reloc resolved to a dlopen'd module. * sysdeps/i386/dl-machine.h (elf_machine_rel, elf_machine_rela): Call it after performing TPOFF relocs. * sysdeps/x86_64/dl-machine.h (elf_machine_rela): Likewise. * sysdeps/sh/dl-machine.h (elf_machine_rela): Likewise. * elf/dl-conflict.c (CHECK_STATIC_TLS): New macro (no-op). * elf/dl-close.c (remove_slotinfo): Change asserts so as not to crash when closing a partially-initialized object. * elf/dl-load.c (_dl_map_object_from_fd) [! USE_TLS]: Call lose instead of _dl_fatal_printf when we see PT_TLS. --- elf/dl-close.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'elf/dl-close.c') diff --git a/elf/dl-close.c b/elf/dl-close.c index b7b267e2bf..7655ef433e 100644 --- a/elf/dl-close.c +++ b/elf/dl-close.c @@ -53,18 +53,22 @@ remove_slotinfo (size_t idx, struct dtv_slotinfo_list *listp, size_t disp) else { struct link_map *old_map = listp->slotinfo[idx - disp].map; - assert (old_map != NULL); - /* Mark the entry as unused. */ - listp->slotinfo[idx - disp].gen = GL(dl_tls_generation) + 1; - listp->slotinfo[idx - disp].map = NULL; + /* The entry might still be in its unused state if we are closing an + object that wasn't fully set up. */ + if (__builtin_expect (old_map != NULL, 1)) + { + assert (old_map->l_tls_modid == idx); + + /* Mark the entry as unused. */ + listp->slotinfo[idx - disp].gen = GL(dl_tls_generation) + 1; + listp->slotinfo[idx - disp].map = NULL; + } /* If this is not the last currently used entry no need to look further. */ - if (old_map->l_tls_modid != GL(dl_tls_max_dtv_idx)) + if (idx != GL(dl_tls_max_dtv_idx)) return true; - - assert (old_map->l_tls_modid == GL(dl_tls_max_dtv_idx)); } while (idx - disp > disp == 0 ? 1 + GL(dl_tls_static_nelem) : 0) -- cgit v1.2.3