Don't crash in trace mode when dependencies are missing

(cherry picked from commit 18a26b301b6ab0d68474fbfffb0d17adf69e8824)

diff --git a/ChangeLog b/ChangeLog
index 18e059866e9c207b2b69f8802689e84e1e192eba..c26934ae3b128f3cb0fd433564e9e3b21488ac3a 100644 (file)
--- 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-09  Ulrich Drepper  <drepper@redhat.com>
 
        * nscd/aicache.c (addhstaiX): Correct passing memory to address

diff --git a/elf/dl-version.c b/elf/dl-version.c
index 9e881162a605982d4fe8173cd7a088792849f941..c59a6c3cd3ee63b3e84a964c7ba949a2ff094d9c 100644 (file)
--- 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.  */