diff options
| author | Roland McGrath <roland@gnu.org> | 2002-10-17 12:10:17 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2002-10-17 12:10:17 +0000 |
| commit | 2430d57a13f4f10312e13c58962cd9104e6428fd (patch) | |
| tree | 6690ca0a7115c798e9c34cf24f55acf14311d661 /elf/dl-reloc.c | |
| parent | d29724f8706e4e46994d6fabafc8389f7624cd0f (diff) | |
| download | glibc-2430d57a13f4f10312e13c58962cd9104e6428fd.tar.gz glibc-2430d57a13f4f10312e13c58962cd9104e6428fd.tar.xz glibc-2430d57a13f4f10312e13c58962cd9104e6428fd.zip | |
* 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.
Diffstat (limited to 'elf/dl-reloc.c')
| -rw-r--r-- | elf/dl-reloc.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/elf/dl-reloc.c b/elf/dl-reloc.c index 37d1ee019f..d6db62b11e 100644 --- a/elf/dl-reloc.c +++ b/elf/dl-reloc.c @@ -159,6 +159,15 @@ _dl_relocate_object (struct link_map *l, struct r_scope_elem *scope[], l->l_lookup_cache.value = _lr; })) \ : l->l_addr) +#define CHECK_STATIC_TLS(map, sym_map) \ + do { \ + if (__builtin_expect ((sym_map)->l_tls_offset == 0, 0)) \ + { \ + errstring = N_("shared object cannot be dlopen()ed"); \ + INTUSE(_dl_signal_error) (0, (map)->l_name, NULL, errstring); \ + } \ + } while (0) + #include "dynamic-link.h" ELF_DYNAMIC_RELOCATE (l, lazy, consider_profiling); |