diff options
author | Alexandre Oliva <aoliva@redhat.com> | 2015-03-17 01:14:11 -0300 |
---|---|---|
committer | Alexandre Oliva <aoliva@redhat.com> | 2015-03-17 00:31:49 -0300 |
commit | f8aeae347377f3dfa8cbadde057adf1827fb1d44 (patch) | |
tree | cee16d94d0f5b7061455667057da4f141f98b9ae /nptl_db/td_symbol_list.c | |
parent | b97eb2bdb1ed72982a7821c3078be591051cef59 (diff) | |
download | glibc-f8aeae347377f3dfa8cbadde057adf1827fb1d44.zip glibc-f8aeae347377f3dfa8cbadde057adf1827fb1d44.tar.gz glibc-f8aeae347377f3dfa8cbadde057adf1827fb1d44.tar.bz2 |
Fix DTV race, assert, DTV_SURPLUS Static TLS limit, and nptl_db garbage
for ChangeLog
[BZ #17090]
[BZ #17620]
[BZ #17621]
[BZ #17628]
* NEWS: Update.
* elf/dl-tls.c (_dl_update_slotinfo): Clean up outdated DTV
entries with Static TLS too. Skip entries past the end of the
allocated DTV, from Alan Modra.
(tls_get_addr_tail): Update to glibc_likely/unlikely. Move
Static TLS DTV entry set up from...
(_dl_allocate_tls_init): ... here (fix modid assertion), ...
* elf/dl-reloc.c (_dl_nothread_init_static_tls): ... here...
* nptl/allocatestack.c (init_one_static_tls): ... and here...
* elf/dlopen.c (dl_open_worker): Drop l_tls_modid upper bound
for Static TLS.
* elf/tlsdeschtab.h (map_generation): Return size_t. Check
that the slot we find is associated with the given map before
using its generation count.
* nptl_db/db_info.c: Include ldsodefs.h.
(rtld_global, dtv_slotinfo_list, dtv_slotinfo): New typedefs.
* nptl_db/structs.def (DB_RTLD_VARIABLE): New macro.
(DB_MAIN_VARIABLE, DB_RTLD_GLOBAL_FIELD): Likewise.
(link_map::l_tls_offset): New struct field.
(dtv_t::counter): Likewise.
(rtld_global): New struct.
(_rtld_global): New rtld variable.
(dl_tls_dtv_slotinfo_list): New rtld global field.
(dtv_slotinfo_list): New struct.
(dtv_slotinfo): Likewise.
* nptl_db/td_symbol_list.c: Drop gnu/lib-names.h include.
(td_lookup): Rename to...
(td_mod_lookup): ... this. Use new mod parameter instead of
LIBPTHREAD_SO.
* nptl_db/td_thr_tlsbase.c: Include link.h.
(dtv_slotinfo_list, dtv_slotinfo): New functions.
(td_thr_tlsbase): Check DTV generation. Compute Static TLS
addresses even if the DTV is out of date or missing them.
* nptl_db/fetch-value.c (_td_locate_field): Do not refuse to
index zero-length arrays.
* nptl_db/thread_dbP.h: Include gnu/lib-names.h.
(td_lookup): Make it a macro implemented in terms of...
(td_mod_lookup): ... this declaration.
* nptl_db/db-symbols.awk (DB_RTLD_VARIABLE): Override.
(DB_MAIN_VARIABLE): Likewise.
Diffstat (limited to 'nptl_db/td_symbol_list.c')
-rw-r--r-- | nptl_db/td_symbol_list.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/nptl_db/td_symbol_list.c b/nptl_db/td_symbol_list.c index 6915ed7..b6c459f 100644 --- a/nptl_db/td_symbol_list.c +++ b/nptl_db/td_symbol_list.c @@ -18,7 +18,6 @@ <http://www.gnu.org/licenses/>. */ #include <assert.h> -#include <gnu/lib-names.h> #include "thread_dbP.h" static const char *symbol_list_arr[] = @@ -41,12 +40,12 @@ td_symbol_list (void) ps_err_e -td_lookup (struct ps_prochandle *ps, int idx, psaddr_t *sym_addr) +td_mod_lookup (struct ps_prochandle *ps, const char *mod, + int idx, psaddr_t *sym_addr) { ps_err_e result; assert (idx >= 0 && idx < SYM_NUM_MESSAGES); - result = ps_pglobal_lookup (ps, LIBPTHREAD_SO, symbol_list_arr[idx], - sym_addr); + result = ps_pglobal_lookup (ps, mod, symbol_list_arr[idx], sym_addr); return result; } |