This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
[PATCH] elf: Check if the first symbol version is base version
- From: "H.J. Lu" <hongjiu dot lu at intel dot com>
- To: binutils at sourceware dot org
- Cc: Nick Clifton <nickc at redhat dot com>
- Date: Wed, 13 Jun 2018 05:20:01 -0700
- Subject: [PATCH] elf: Check if the first symbol version is base version
- Reply-to: "H.J. Lu" <hjl dot tools at gmail dot com>
Check VER_FLG_BASE instead of assuming that the first symbol version is
base version.
OK for master?
H.J.
---
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.
---
bfd/elf.c | 5 ++++-
binutils/readelf.c | 7 ++++++-
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/bfd/elf.c b/bfd/elf.c
index 6c66bbca02..0f75375128 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/readelf.c b/binutils/readelf.c
index 8335538e03..40d9cf9afd 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;
--
2.17.1