PowerPC64 offset check should test entire 64-bit value is in section

	PR binutils/17512
	* elf64-ppc.c (opd_entry_value): Tighten offset check.  Remove
	now redundant assert.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 1dd74d0d4a7f6ae1d218dd4ba95d45b016dd6f29..cb08b7738f3ce94b5ce8559e183ad0cff888f432 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2015-02-13  Alan Modra  <amodra@gmail.com>
+
+       PR binutils/17512
+       * elf64-ppc.c (opd_entry_value): Tighten offset check.  Remove
+       now redundant assert.
+
 2015-02-12  Nick Clifton  <nickc@redhat.com>
 
        PR binutils/17512

diff --git a/bfd/elf64-ppc.c b/bfd/elf64-ppc.c
index 542ed1ca31f5eee7bff5ae1c2ed6ce9052502e57..38bc3fb392a3f73509a89c5582e2f450d5956f17 100644 (file)
--- a/bfd/elf64-ppc.c
+++ b/bfd/elf64-ppc.c
@@ -5952,7 +5952,7 @@ opd_entry_value (asection *opd_sec,
        }
 
       /* PR 17512: file: 64b9dfbb.  */
-      if (offset > bfd_section_size (opd_bfd, opd_sec))
+      if (offset + 7 >= opd_sec->size || offset + 7 < offset)
        return (bfd_vma) -1;
 
       val = bfd_get_64 (opd_bfd, contents + offset);
@@ -5996,7 +5996,6 @@ opd_entry_value (asection *opd_sec,
 
   /* Go find the opd reloc at the sym address.  */
   lo = relocs;
-  BFD_ASSERT (lo != NULL);
   hi = lo + opd_sec->reloc_count - 1; /* ignore last reloc */
   val = (bfd_vma) -1;
   while (lo < hi)