Check for an invalid note size when parsing ELF notes.

	PR 21933
	PR 22060
	* elf.c (elf_read_notes): Check for a note size of -1.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index e9ea6cfdda3fb746748b97777a67dd415a94e258..8db7080931828fecd5658345f99aac15c6865d64 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2017-09-01  Nick Clifton  <nickc@redhat.com>
+
+       PR 21933
+       PR 22060
+       * elf.c (elf_read_notes): Check for a note size of -1.
+
 2017-09-01  Nick Clifton  <nickc@redhat.com>
 
        PR 22058

diff --git a/bfd/elf.c b/bfd/elf.c
index 063a6e4bb318f22f1e8c14ba088e3cb39eed55e8..fbf639b357eaea41fe9496c1430e43aa0e7bfc5c 100644 (file)
--- a/bfd/elf.c
+++ b/bfd/elf.c
@@ -10976,7 +10976,7 @@ elf_read_notes (bfd *abfd, file_ptr offset, bfd_size_type size)
 {
   char *buf;
 
-  if (size <= 0)
+  if (size == 0 || (size + 1) == 0)
     return TRUE;
 
   if (bfd_seek (abfd, offset, SEEK_SET) != 0)