From: Nick Clifton <nickc@redhat.com>
Date: Thu, 26 Jun 2014 08:32:25 +0000 (+0100)
Subject: Fixes part of a problem reading deliberately non-conforming ELF binaries - where a
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=df565f326e62eacf41fb880f1acc65b9fdb5052c;p=binutils-gdb.git

Fixes part of a problem reading deliberately non-conforming ELF binaries - where a
note segment is present but no note section.

	* readelf.c (process_note_sections): If there are no note sections
	try processing note segments instead.
---

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 71eca314fa2..cc698cb0aaf 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,8 @@
+2014-06-26  Nick Clifton  <nickc@redhat.com>
+
+	* readelf.c (process_note_sections): If there are no note sections
+	try processing note segments instead.
+
 2014-06-17  Anton Lavrentiwev  <lavr@ncbi.nim.nih.gov>
 
 	PR binutils/16923
diff --git a/binutils/readelf.c b/binutils/readelf.c
index af6463e6ad4..d85786e28a1 100644
--- a/binutils/readelf.c
+++ b/binutils/readelf.c
@@ -14050,15 +14050,23 @@ process_note_sections (FILE * file)
 {
   Elf_Internal_Shdr * section;
   unsigned long i;
+  int n = 0;
   int res = 1;
 
   for (i = 0, section = section_headers;
        i < elf_header.e_shnum && section != NULL;
        i++, section++)
     if (section->sh_type == SHT_NOTE)
-      res &= process_corefile_note_segment (file,
-					    (bfd_vma) section->sh_offset,
-					    (bfd_vma) section->sh_size);
+      {
+	res &= process_corefile_note_segment (file,
+					      (bfd_vma) section->sh_offset,
+					      (bfd_vma) section->sh_size);
+	n++;
+      }
+
+  if (n == 0)
+    /* Try processing NOTE segments instead.  */
+    return process_corefile_note_segments (file);
 
   return res;
 }