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.11-377-g18a26b3
- From: drepper at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 15 Apr 2010 05:16:22 -0000
- Subject: GNU C Library master sources branch, master, updated. glibc-2.11-377-g18a26b3
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 18a26b301b6ab0d68474fbfffb0d17adf69e8824 (commit)
from 2645b8e5cc44efe4856b1dad351414e50d91dfad (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://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=18a26b301b6ab0d68474fbfffb0d17adf69e8824
commit 18a26b301b6ab0d68474fbfffb0d17adf69e8824
Author: Andreas Schwab <schwab@redhat.com>
Date: Wed Apr 14 22:16:06 2010 -0700
Don't crash in trace mode when dependencies are missing
diff --git a/ChangeLog b/ChangeLog
index 0196c24..9b23fd9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-14 Andreas Schwab <schwab@redhat.com>
+
+ * elf/dl-version.c (_dl_check_map_versions): Avoid index overflow
+ when dependencies are missing.
+
2010-04-14 H.J. Lu <hongjiu.lu@intel.com>
* sysdeps/x86_64/multiarch/memcmp-sse4.S: Optimized for unaligned
diff --git a/elf/dl-version.c b/elf/dl-version.c
index 9e88116..c59a6c3 100644
--- a/elf/dl-version.c
+++ b/elf/dl-version.c
@@ -322,10 +322,14 @@ _dl_check_map_versions (struct link_map *map, int verbose, int trace_mode)
while (1)
{
ElfW(Half) ndx = aux->vna_other & 0x7fff;
- map->l_versions[ndx].hash = aux->vna_hash;
- map->l_versions[ndx].hidden = aux->vna_other & 0x8000;
- map->l_versions[ndx].name = &strtab[aux->vna_name];
- map->l_versions[ndx].filename = &strtab[ent->vn_file];
+ /* In trace mode, dependencies may be missing. */
+ if (__builtin_expect (ndx < map->l_nversions, 1))
+ {
+ map->l_versions[ndx].hash = aux->vna_hash;
+ map->l_versions[ndx].hidden = aux->vna_other & 0x8000;
+ map->l_versions[ndx].name = &strtab[aux->vna_name];
+ map->l_versions[ndx].filename = &strtab[ent->vn_file];
+ }
if (aux->vna_next == 0)
/* No more symbols. */
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 5 +++++
elf/dl-version.c | 12 ++++++++----
2 files changed, 13 insertions(+), 4 deletions(-)
hooks/post-receive
--
GNU C Library master sources