diff options
| author | Andreas Schwab <schwab@redhat.com> | 2010-04-14 22:16:06 -0700 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2010-04-14 22:16:06 -0700 |
| commit | 18a26b301b6ab0d68474fbfffb0d17adf69e8824 (patch) | |
| tree | 849dadef22c24dd499bcad6962eaed42550bc5ae | |
| parent | 2645b8e5cc44efe4856b1dad351414e50d91dfad (diff) | |
| download | glibc-18a26b301b6ab0d68474fbfffb0d17adf69e8824.tar.gz glibc-18a26b301b6ab0d68474fbfffb0d17adf69e8824.tar.xz glibc-18a26b301b6ab0d68474fbfffb0d17adf69e8824.zip | |
Don't crash in trace mode when dependencies are missing
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | elf/dl-version.c | 12 |
2 files changed, 13 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index 0196c24be8..9b23fd979d 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 9e881162a6..c59a6c3cd3 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. */ |