[PATCH] readelf: Try to continue after encountering bogus ELF Note data.

[PATCH] readelf: Try to continue after encountering bogus ELF Note data.

[Mark Wielaard]

There might be other sections or segments with ELF Notes that are
readable. Also adjust error message depending on whether or not we
actually got any data for the ELF Note segment or section.

Signed-off-by: Mark Wielaard <mark@klomp.org>
---
 src/ChangeLog | 5 +++++
 src/readelf.c | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/ChangeLog b/src/ChangeLog
index 8935022..994b1e1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2017-12-18  Mark Wielaard  <mark@klomp.org>
+
+	* readelf.c (handle_notes_data): Don't use EXIT_FAILURE in error.
+	Adjust error message depending on whether or not we got data.
+
 2017-12-07  Mark Wielaard  <mark@klomp.org>
 
 	* readelf.c (print_ops): Update data pointer and print arguments
diff --git a/src/readelf.c b/src/readelf.c
index ed21ef7..ca979e3 100644
--- a/src/readelf.c
+++ b/src/readelf.c
@@ -9611,9 +9611,9 @@ handle_notes_data (Ebl *ebl, const GElf_Ehdr *ehdr,
     return;
 
  bad_note:
-  error (EXIT_FAILURE, 0,
-	 gettext ("cannot get content of note section: %s"),
-	 elf_errmsg (-1));
+  error (0, 0,
+	 gettext ("cannot get content of note: %s"),
+	 data != NULL ? "garbage data" : elf_errmsg (-1));
 }
 
 static void
-- 
1.8.3.1

Re: [PATCH] readelf: Try to continue after encountering bogus ELF Note data.

[Mark Wielaard]

On Mon, Dec 18, 2017 at 12:41:09PM +0100, Mark Wielaard wrote:
> There might be other sections or segments with ELF Notes that are
> readable. Also adjust error message depending on whether or not we
> actually got any data for the ELF Note segment or section.

Pushed to master.