diff options
| -rw-r--r-- | bfd/ChangeLog | 6 | ||||
| -rw-r--r-- | bfd/elf.c | 2 | ||||
| -rw-r--r-- | binutils/ChangeLog | 6 | ||||
| -rw-r--r-- | binutils/readelf.c | 9 |
4 files changed, 22 insertions, 1 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index c9e7e2a..3af19d5 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,9 @@ +2018-08-25 H.J. Lu <hongjiu.lu@intel.com> + + PR ld/23499 + * elf.c (_bfd_elf_get_symbol_version_string): Return + _("<corrupt>") for corrupt symbol version info. + 2018-08-24 H.J. Lu <hongjiu.lu@intel.com> * elfxx-x86.c (_bfd_x86_elf_parse_gnu_properties): Handle @@ -1877,7 +1877,7 @@ _bfd_elf_get_symbol_version_string (bfd *abfd, asymbol *symbol, { Elf_Internal_Verneed *t; - version_string = ""; + version_string = _("<corrupt>"); for (t = elf_tdata (abfd)->verref; t != NULL; t = t->vn_nextref) diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 3e26571..ef9a5fd 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,9 @@ +2018-08-25 H.J. Lu <hongjiu.lu@intel.com> + + PR ld/23499 + * readelf.c (get_symbol_version_string): Return _("<corrupt>") + for corrupt symbol version info. + 2018-08-24 H.J. Lu <hongjiu.lu@intel.com> * readelf.c (decode_x86_compat_isa): New function. diff --git a/binutils/readelf.c b/binutils/readelf.c index 8d4054f..23e61d3 100644 --- a/binutils/readelf.c +++ b/binutils/readelf.c @@ -11300,6 +11300,7 @@ get_symbol_version_string (Filedata * filedata, unsigned char data[2]; unsigned short vers_data; unsigned long offset; + unsigned short max_vd_ndx; if (!is_dynsym || version_info[DT_VERSIONTAGIDX (DT_VERSYM)] == 0) @@ -11317,6 +11318,8 @@ get_symbol_version_string (Filedata * filedata, if ((vers_data & VERSYM_HIDDEN) == 0 && vers_data == 0) return NULL; + max_vd_ndx = 0; + /* Usually we'd only see verdef for defined symbols, and verneed for undefined symbols. However, symbols defined by the linker in .dynbss for variables copied from a shared library in order to @@ -11359,6 +11362,9 @@ get_symbol_version_string (Filedata * filedata, ivd.vd_flags = BYTE_GET (evd.vd_flags); } + if ((ivd.vd_ndx & VERSYM_VERSION) > max_vd_ndx) + max_vd_ndx = ivd.vd_ndx & VERSYM_VERSION; + off += ivd.vd_next; } while (ivd.vd_ndx != (vers_data & VERSYM_VERSION) && ivd.vd_next != 0); @@ -11450,6 +11456,9 @@ get_symbol_version_string (Filedata * filedata, return (ivna.vna_name < strtab_size ? strtab + ivna.vna_name : _("<corrupt>")); } + else if ((max_vd_ndx || (vers_data & VERSYM_VERSION) != 1) + && (vers_data & VERSYM_VERSION) > max_vd_ndx) + return _("<corrupt>"); } return NULL; } |