espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-17 07:53:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

PR24272, out-of-bounds read in pex64_xdata_print_uwd_codes

Browse Source 
The fix here is to use an unsigned comparison for
    if (a->NumberOfRvaAndSizes > IMAGE_NUMBEROF_DIRECTORY_ENTRIES)

include/
	PR 24272
	* coff/internal.h (struct internal_extra_pe_aouthdr): Change type
	of SizeOfCode, SizeOfInitializedData, and SizeOfUninitializedData
	to bfd_vma.  Change type of SectionAlignment, FileAlignment,
	Reserved1, SizeOfImage, SizeOfHeaders, CheckSum, LoaderFlags,
	and NumberOfRvaAndSizes to uint32_t.
bfd/
	PR 24272
	* peXXigen.c (_bfd_XXi_swap_aouthdr_in): Use unsigned index.
	(_bfd_XX_print_private_bfd_data_common): Adjust for type changes.
This commit is contained in:
Alan Modra
2019-03-01 09:28:47 +10:30
parent b09e83c1f8
commit b24cc4146e
2 changed files with 37 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
include/coff/internal.h
View File

@ -197,11 +197,11 @@ struct internal_extra_pe_aouthdr
/* Linker minor version number. */
char MinorLinkerVersion;
/* Total size of all code sections. */
long SizeOfCode;
bfd_vma SizeOfCode;
/* Total size of all initialized data sections. */
long SizeOfInitializedData;
bfd_vma SizeOfInitializedData;
/* Total size of all uninitialized data sections. */
long SizeOfUninitializedData;
bfd_vma SizeOfUninitializedData;
/* Address of entry point relative to image base. */
bfd_vma AddressOfEntryPoint;
/* Address of the first code section relative to image base. */
@ -211,21 +211,21 @@ struct internal_extra_pe_aouthdr
/* PE stuff */
bfd_vma ImageBase; /* Address of specific location in memory that
file is located, NT default 0x10000. */
file is located, NT default 0x10000. */
bfd_vma SectionAlignment; /* Section alignment default 0x1000. */
bfd_vma FileAlignment; /* File alignment default 0x200. */
short MajorOperatingSystemVersion; /* Minimum version of the operating. */
short MinorOperatingSystemVersion; /* System req'd for exe, default to 1. */
short MajorImageVersion; /* User defineable field to store version of */
short MinorImageVersion; /* exe or dll being created, default to 0. */
short MajorSubsystemVersion; /* Minimum subsystem version required to */
short MinorSubsystemVersion; /* run exe; default to 3.1. */
long Reserved1; /* Seems to be 0. */
long SizeOfImage; /* Size of memory to allocate for prog. */
long SizeOfHeaders; /* Size of PE header and section table. */
long CheckSum; /* Set to 0. */
short Subsystem;
uint32_t SectionAlignment; /* Section alignment default 0x1000. */
uint32_t FileAlignment; /* File alignment default 0x200. */
short MajorOperatingSystemVersion; /* Minimum version of the operating. */
short MinorOperatingSystemVersion; /* System req'd for exe, default 1. */
short MajorImageVersion; /* User defineable field to store version of */
short MinorImageVersion; /* exe or dll being created, default to 0. */
short MajorSubsystemVersion; /* Minimum subsystem version required to */
short MinorSubsystemVersion; /* run exe; default to 3.1. */
uint32_t Reserved1; /* Seems to be 0. */
uint32_t SizeOfImage; /* Size of memory to allocate for prog. */
uint32_t SizeOfHeaders; /* Size of PE header and section table. */
uint32_t CheckSum; /* Set to 0. */
short Subsystem;
/* Type of subsystem exe uses for user interface,
possible values:
@ -237,11 +237,11 @@ struct internal_extra_pe_aouthdr
unsigned short DllCharacteristics; /* flags for DLL init. */
bfd_vma SizeOfStackReserve; /* Amount of memory to reserve. */
bfd_vma SizeOfStackCommit; /* Amount of memory initially committed for
initial thread's stack, default is 0x1000. */
initial thread's stack, default 0x1000. */
bfd_vma SizeOfHeapReserve; /* Amount of virtual memory to reserve and */
bfd_vma SizeOfHeapCommit; /* commit, don't know what to defaut it to. */
long LoaderFlags; /* Can probably set to 0. */
long NumberOfRvaAndSizes; /* Number of entries in next entry, 16. */
uint32_t LoaderFlags; /* Can probably set to 0. */
uint32_t NumberOfRvaAndSizes; /* Number of entries in next entry, 16. */
IMAGE_DATA_DIRECTORY DataDirectory[IMAGE_NUMBEROF_DIRECTORY_ENTRIES];
};