Toolchain/binutils-gdb
1
0
Fork 0
forked from Imagelibrary/binutils-gdb
Code Pull Requests Activity

Fix seg-fault in objdump when run on a fuzzed PE binary.

Browse Source 
PR binutils/20605
	* peicode.h (pe_bfd_read_buildid): Check that the Data Directory
	contains a valid size for the Debug directory.
This commit is contained in:
Nick Clifton
2016-09-14 15:32:01 +01:00
parent fc7514d6f2
commit e6d042fe27
2 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bfd/ChangeLog
View File

@@ -1,3 +1,9 @@
2016-09-14 Nick Clifton <nickc@redhat.com>
PR binutils/20605
* peicode.h (pe_bfd_read_buildid): Check that the Data Directory
contains a valid size for the Debug directory.
2016-09-14 Bhushan Attarde <bhushan.attarde@imgtec.com>
* format.c (struct bfd_preserve): New "build_id" field.

27
bfd/peicode.h
View File

@@ -1289,7 +1289,7 @@ pe_ILF_object_p (bfd * abfd)
}
static void
pe_bfd_read_buildid(bfd *abfd)
pe_bfd_read_buildid (bfd *abfd)
{
pe_data_type *pe = pe_data (abfd);
struct internal_extra_pe_aouthdr *extra = &pe->pe_opthdr;
@@ -1306,7 +1306,7 @@ pe_bfd_read_buildid(bfd *abfd)
addr += extra->ImageBase;
/* Search for the section containing the DebugDirectory */
/* Search for the section containing the DebugDirectory. */
for (section = abfd->sections; section != NULL; section = section->next)
{
if ((addr >= section->vma) && (addr < (section->vma + section->size)))
@@ -1314,16 +1314,21 @@ pe_bfd_read_buildid(bfd *abfd)
}
if (section == NULL)
{
return;
}
else if (!(section->flags & SEC_HAS_CONTENTS))
{
return;
}
return;
if (!(section->flags & SEC_HAS_CONTENTS))
return;
dataoff = addr - section->vma;
/* PR 20605: Make sure that the data is really there. */
if (dataoff + size > section->size)
{
_bfd_error_handler (_("%B: Error: Debug Data ends beyond end of debug directory."),
abfd);
return;
}
/* Read the whole section. */
if (!bfd_malloc_and_get_section (abfd, section, &data))
{
@@ -1354,8 +1359,8 @@ pe_bfd_read_buildid(bfd *abfd)
(file_ptr) idd.PointerToRawData,
idd.SizeOfData, cvinfo))
{
struct bfd_build_id* build_id = bfd_alloc(abfd,
sizeof(struct bfd_build_id) + cvinfo->SignatureLength);
struct bfd_build_id* build_id = bfd_alloc (abfd,
sizeof (struct bfd_build_id) + cvinfo->SignatureLength);
if (build_id)
{
build_id->size = cvinfo->SignatureLength;