From a615be46758fd857872e3e2a12f1fd296bee1a7c Mon Sep 17 00:00:00 2001 From: Marcus Shawcroft Date: Wed, 13 Nov 2013 12:37:41 +0000 Subject: [PATCH] Handle NULL return from htab_find_slot() --- ChangeLog | 5 +++++ elf/tlsdeschtab.h | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/ChangeLog b/ChangeLog index ac141b8..b129b32 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2013-11-13 Marcus Shawcroft + + * elf/tlsdeschtab.h (_dl_make_tlsdesc_dynamic): Handle failure + of htab_find_slot(). + 2013-11-11 David S. Miller [BZ #16150] diff --git a/elf/tlsdeschtab.h b/elf/tlsdeschtab.h index 155f4fd..8ce8249 100644 --- a/elf/tlsdeschtab.h +++ b/elf/tlsdeschtab.h @@ -102,6 +102,12 @@ _dl_make_tlsdesc_dynamic (struct link_map *map, size_t ti_offset) test.tlsinfo.ti_module = map->l_tls_modid; test.tlsinfo.ti_offset = ti_offset; entry = htab_find_slot (ht, &test, 1, hash_tlsdesc, eq_tlsdesc); + if (! entry) + { + __rtld_lock_unlock_recursive (GL(dl_load_lock)); + return 0; + } + if (*entry) { td = *entry; -- 2.7.4