From: Mark Wielaard <mark@klomp.org>
Date: Sat, 4 Aug 2018 20:32:56 +0000 (+0200)
Subject: backends: Use elf_getshdrstrndx to find .odp section in ppc64_init
X-Git-Tag: elfutils-0.174~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=19756e7fb614831f4a5f5ff5b996675fae638782;p=thirdparty%2Felfutils.git

backends: Use elf_getshdrstrndx to find .odp section in ppc64_init

The .odp section is found by name. But ppc64_init used the e_shstrndx
Ehdr field for that. This is wrong if the file contains more than
SHN_LORESERVE sections. Use elf_getshdrstrndx instead to find the
shstrtab section.

Signed-off-by: Mark Wielaard <mark@klomp.org>
---

diff --git a/backends/ChangeLog b/backends/ChangeLog
index ada349fe5..fdff30219 100644
--- a/backends/ChangeLog
+++ b/backends/ChangeLog
@@ -1,3 +1,7 @@
+2018-09-12  Mark Wielaard  <mark@klomp.org>
+
+	* ppc64_init.c (ppc64_init): Use elf_getshdrstrndx.
+
 2018-09-12  Mark Wielaard  <mark@klomp.org>
 
 	* aarch64_symbol.c (aarch64_check_special_symbol): Drop ehdr argument,
diff --git a/backends/ppc64_init.c b/backends/ppc64_init.c
index e5670338c..3db5e7666 100644
--- a/backends/ppc64_init.c
+++ b/backends/ppc64_init.c
@@ -80,7 +80,9 @@ ppc64_init (Elf *elf __attribute__ ((unused)),
   if (elf != NULL)
     {
       GElf_Ehdr ehdr_mem, *ehdr = gelf_getehdr (elf, &ehdr_mem);
-      if (ehdr != NULL && ehdr->e_type != ET_REL)
+      size_t shstrndx;
+      if (ehdr != NULL && ehdr->e_type != ET_REL
+	  && elf_getshdrstrndx (elf, &shstrndx) == 0)
 	{
 	  /* We could also try through DT_PPC64_OPD and DT_PPC64_OPDSZ. */
 	  GElf_Shdr opd_shdr_mem, *opd_shdr;
@@ -93,7 +95,7 @@ ppc64_init (Elf *elf __attribute__ ((unused)),
 		  && opd_shdr->sh_type == SHT_PROGBITS
 		  && opd_shdr->sh_size > 0)
 		{
-		  const char *name = elf_strptr (elf, ehdr->e_shstrndx,
+		  const char *name = elf_strptr (elf, shstrndx,
 						 opd_shdr->sh_name);
 		  if (name != NULL && strcmp (name, ".opd") == 0)
 		    {