- rel 4; be able to report corrupted objects

diff --git a/binutils-bug-23499.patch b/binutils-bug-23499.patch
index 698fc2f15166c73eafce909936b383b0d4d92c90..1715acfcf078a387a07e0484788b349878af2df3 100644 (file)
--- a/binutils-bug-23499.patch
+++ b/binutils-bug-23499.patch
@@ -68,3 +68,90 @@ index b24fb95848..02618bed8f 100644
      h->verinfo.verdef = NULL;
  
    /* Make sure this symbol is not garbage collected.  */
+commit 7a815dd566f3dd32435ac73aa0a0cc948d525e06
+Author: H.J. Lu <hjl.tools@gmail.com>
+Date:   Sat Aug 25 06:17:52 2018 -0700
+
+    elf: Check for corrupt symbol version info
+    
+    The BFD linker with PR ld/23499 may generate shared libraries with
+    corrupt symbol version info which leads to linker error when the
+    corrupt shared library is used:
+    
+    /usr/bin/ld: bin/libKF5Service.so.5.49.0: _edata: invalid version 21 (max 0)
+    /usr/bin/ld: bin/libKF5Service.so.5.49.0: error adding symbols: bad value
+    
+    Add check for corrupt symbol version info to objdump:
+    
+    00000000000af005 g    D  .data  0000000000000000  <corrupt>   _edata
+    
+    and readelf:
+    
+       728: 00000000000af005     0 NOTYPE  GLOBAL DEFAULT   25 _edata@<corrupt> (5)
+    
+    bfd/
+    
+            PR ld/23499
+            * elf.c (_bfd_elf_get_symbol_version_string): Return
+            _("<corrupt>") for corrupt symbol version info.
+    
+    binutils/
+    
+            PR ld/23499
+            * readelf.c (get_symbol_version_string): Return _("<corrupt>")
+            for corrupt symbol version info.
+
+diff --git a/bfd/elf.c b/bfd/elf.c
+index efdaf2e256..b8860c453b 100644
+--- a/bfd/elf.c
++++ b/bfd/elf.c
+@@ -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/readelf.c b/binutils/readelf.c
+index 8d4054fbd2..23e61d369a 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;
+ }

diff --git a/binutils.spec b/binutils.spec
index fc23ef81b15d343425a01be4d35e3bd8caae3975..5b661e761cb1d462e0fb2b3799e3a65778b9644e 100644 (file)
--- a/binutils.spec
+++ b/binutils.spec
@@ -24,7 +24,7 @@ Summary(tr.UTF-8):    GNU geliştirme araçları
 Summary(uk.UTF-8):     Набір інструментів GNU для побудови виконуваних програм
 Name:          binutils
 Version:       2.31.1
-Release:       3
+Release:       4
 Epoch:         4
 License:       GPL v3+
 Group:         Development/Tools