From 451dfd384383160be5bc60f50a7920975e66f593 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Fri, 13 Feb 2015 10:16:16 +1030 Subject: [PATCH] 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. --- bfd/ChangeLog | 6 ++++++ bfd/elf64-ppc.c | 3 +-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 1dd74d0d4a7..cb08b7738f3 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,9 @@ +2015-02-13 Alan Modra + + PR binutils/17512 + * elf64-ppc.c (opd_entry_value): Tighten offset check. Remove + now redundant assert. + 2015-02-12 Nick Clifton PR binutils/17512 diff --git a/bfd/elf64-ppc.c b/bfd/elf64-ppc.c index 542ed1ca31f..38bc3fb392a 100644 --- 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) -- 2.30.2