From 5f60af5d24d181371d67534fa273dd221df20c07 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Fri, 30 Nov 2018 11:45:33 +0000 Subject: [PATCH] Fix a memory exhaustion bug when attempting to allocate room for an impossible number of program headers. * elfcode.h (elf_object_p): Check for corrupt input files with more program headers than can actually fit in the file. --- bfd/ChangeLog | 5 +++++ bfd/elfcode.h | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 6ea483597d..f99b0854e7 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,8 @@ +2018-11-30 Nick Clifton + + * elfcode.h (elf_object_p): Check for corrupt input files with + more program headers than can actually fit in the file. + 2018-11-30 Nick Clifton PR 23932 diff --git a/bfd/elfcode.h b/bfd/elfcode.h index f224c8b79d..16ed8e5bb4 100644 --- a/bfd/elfcode.h +++ b/bfd/elfcode.h @@ -784,6 +784,11 @@ elf_object_p (bfd *abfd) if (i_ehdrp->e_phnum > ((bfd_size_type) -1) / sizeof (*i_phdr)) goto got_wrong_format_error; #endif + /* Check for a corrupt input file with an impossibly large number + of program headers. */ + if (bfd_get_file_size (abfd) > 0 + && i_ehdrp->e_phnum > bfd_get_file_size (abfd)) + goto got_no_match; amt = (bfd_size_type) i_ehdrp->e_phnum * sizeof (*i_phdr); elf_tdata (abfd)->phdr = (Elf_Internal_Phdr *) bfd_alloc (abfd, amt); if (elf_tdata (abfd)->phdr == NULL) -- 2.34.1