[binutils-gdb] elf: Check if the first symbol version is base version

[H.J.Lu]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=1f6f5dba57ffbc073b1ead89647288feaaed2caf

commit 1f6f5dba57ffbc073b1ead89647288feaaed2caf
Author: H.J. Lu <hjl.tools@gmail.com>
Date:   Thu Jun 14 05:37:19 2018 -0700

    elf: Check if the first symbol version is base version
    
    Check VER_FLG_BASE instead of assuming that the first symbol version is
    base version.
    
    bfd/
    
    	PR binutils/23267
    	* elf.c (_bfd_elf_get_symbol_version_string): Check if the first
    	symbol version is base version.
    
    binutils/
    
    	PR binutils/23267
    	* readelf.c (get_symbol_version_string): Check if the first
    	symbol version is base version.

Diff:
---
 bfd/ChangeLog      | 6 ++++++
 bfd/elf.c          | 5 ++++-
 binutils/ChangeLog | 6 ++++++
 binutils/readelf.c | 7 ++++++-
 4 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 2aa411d..06498a5 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2018-06-14  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR binutils/23267
+	* elf.c (_bfd_elf_get_symbol_version_string): Check if the first
+	symbol version is base version.
+
 2018-06-14  Alan Modra  <amodra@gmail.com>
 
 	* elf-bfd.h (struct elf_link_hash_table): Add "dynamic_relocs".
diff --git a/bfd/elf.c b/bfd/elf.c
index 6c66bbc..0f75375 100644
--- a/bfd/elf.c
+++ b/bfd/elf.c
@@ -1865,7 +1865,10 @@ _bfd_elf_get_symbol_version_string (bfd *abfd, asymbol *symbol,
 
       if (vernum == 0)
 	version_string = "";
-      else if (vernum == 1)
+      else if (vernum == 1
+	       && (vernum > elf_tdata (abfd)->cverdefs
+		   || (elf_tdata (abfd)->verdef[0].vd_flags
+		       == VER_FLG_BASE)))
 	version_string = "Base";
       else if (vernum <= elf_tdata (abfd)->cverdefs)
 	version_string =
diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 0ec847f..d50ecb9 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,9 @@
+2018-06-14  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR binutils/23267
+	* readelf.c (get_symbol_version_string): Check if the first
+	symbol version is base version.
+
 2018-06-13  Scott Egerton  <scott.egerton@imgtec.com>
 	    Faraz Shahbazker  <Faraz.Shahbazker@mips.com>
 
diff --git a/binutils/readelf.c b/binutils/readelf.c
index 3af729f..2188b25 100644
--- a/binutils/readelf.c
+++ b/binutils/readelf.c
@@ -11266,7 +11266,7 @@ get_symbol_version_string (Filedata *                   filedata,
 
   vers_data = byte_get (data, 2);
 
-  if ((vers_data & VERSYM_HIDDEN) == 0 && vers_data <= 1)
+  if ((vers_data & VERSYM_HIDDEN) == 0 && vers_data == 0)
     return NULL;
 
   /* Usually we'd only see verdef for defined symbols, and verneed for
@@ -11301,12 +11301,14 @@ get_symbol_version_string (Filedata *                   filedata,
 	      ivd.vd_ndx = 0;
 	      ivd.vd_aux = 0;
 	      ivd.vd_next = 0;
+	      ivd.vd_flags = 0;
 	    }
 	  else
 	    {
 	      ivd.vd_ndx = BYTE_GET (evd.vd_ndx);
 	      ivd.vd_aux = BYTE_GET (evd.vd_aux);
 	      ivd.vd_next = BYTE_GET (evd.vd_next);
+	      ivd.vd_flags = BYTE_GET (evd.vd_flags);
 	    }
 
 	  off += ivd.vd_next;
@@ -11315,6 +11317,9 @@ get_symbol_version_string (Filedata *                   filedata,
 
       if (ivd.vd_ndx == (vers_data & VERSYM_VERSION))
 	{
+	  if (ivd.vd_ndx == 1 && ivd.vd_flags == VER_FLG_BASE) 
+	    return NULL;
+
 	  off -= ivd.vd_next;
 	  off += ivd.vd_aux;