This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.18-379-g50727aa
- From: mshawcroft at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 13 Nov 2013 12:41:05 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.18-379-g50727aa
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via 50727aa76b42c3b989a8c0612eb7f63e29aa7fec (commit)
via a615be46758fd857872e3e2a12f1fd296bee1a7c (commit)
from 7ddace62b0ea4c733fec0a50b52dbdef64f40c9c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=50727aa76b42c3b989a8c0612eb7f63e29aa7fec
commit 50727aa76b42c3b989a8c0612eb7f63e29aa7fec
Author: Marcus Shawcroft <marcus.shawcroft@linaro.org>
Date: Wed Nov 13 12:40:31 2013 +0000
Avoid passing NULL to DSO_FILENAME.
diff --git a/ChangeLog b/ChangeLog
index b129b32..67c0c38 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2013-11-13 Marcus Shawcroft <marcus.shawcroft@linaro.org>
+ * elf/dl-lookup.c (_dl_lookup_symbol_x): If UNDEF_MAP is false
+ set reference_name to "" to avoid passing NULL to DSO_FILENAME.
+
+2013-11-13 Marcus Shawcroft <marcus.shawcroft@linaro.org>
+
* elf/tlsdeschtab.h (_dl_make_tlsdesc_dynamic): Handle failure
of htab_find_slot().
diff --git a/elf/dl-lookup.c b/elf/dl-lookup.c
index 39f463e..f869dcf 100644
--- a/elf/dl-lookup.c
+++ b/elf/dl-lookup.c
@@ -746,7 +746,7 @@ _dl_lookup_symbol_x (const char *undef_name, struct link_map *undef_map,
contain the needed symbol. This code is never reached
for unversioned lookups. */
assert (version != NULL);
- const char *reference_name = undef_map ? undef_map->l_name : NULL;
+ const char *reference_name = undef_map ? undef_map->l_name : "";
/* XXX We cannot translate the message. */
_dl_signal_cerror (0, DSO_FILENAME (reference_name),
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=a615be46758fd857872e3e2a12f1fd296bee1a7c
commit a615be46758fd857872e3e2a12f1fd296bee1a7c
Author: Marcus Shawcroft <marcus.shawcroft@linaro.org>
Date: Wed Nov 13 12:37:41 2013 +0000
Handle NULL return from htab_find_slot()
diff --git a/ChangeLog b/ChangeLog
index ac141b8..b129b32 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-13 Marcus Shawcroft <marcus.shawcroft@linaro.org>
+
+ * elf/tlsdeschtab.h (_dl_make_tlsdesc_dynamic): Handle failure
+ of htab_find_slot().
+
2013-11-11 David S. Miller <davem@davemloft.net>
[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;
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 10 ++++++++++
elf/dl-lookup.c | 2 +-
elf/tlsdeschtab.h | 6 ++++++
3 files changed, 17 insertions(+), 1 deletions(-)
hooks/post-receive
--
GNU C Library master sources