From df565f326e62eacf41fb880f1acc65b9fdb5052c Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Thu, 26 Jun 2014 09:32:25 +0100 Subject: [PATCH] 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. --- binutils/ChangeLog | 5 +++++ binutils/readelf.c | 14 +++++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 71eca314fa..cc698cb0aa 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,8 @@ +2014-06-26 Nick Clifton + + * readelf.c (process_note_sections): If there are no note sections + try processing note segments instead. + 2014-06-17 Anton Lavrentiwev PR binutils/16923 diff --git a/binutils/readelf.c b/binutils/readelf.c index af6463e6ad..d85786e28a 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; }