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

asan: readelf: process_mips_specific buffer overflow

Browse Source 
DT_MIPS_OPTIONS is not a regular array as assumed by readelf.  This
patch corrects that assumption, and to do so easily, makes various
internal (host byte order) structs the same size as external (target
byte order) structs.

include/
	* elf/mips.h (Elf32_RegInfo): Use fixed width integer types.
	(Elf64_Internal_RegInfo, Elf_Internal_Options): Likewise.
binutils/
	* readelf.c (process_mips_specific): Assert size of internal
	types match size of external types, and simplify allocation of
	internal buffer.  Catch possible integer overflow when sanity
	checking option size.  Don't assume options are a regular array.
	Sanity check reginfo option against option size.  Use PRI macros
	when printing.
This commit is contained in:
Alan Modra
2020-06-11 13:27:50 +09:30
parent ec16513e31
commit d0c4e7802d
4 changed files with 49 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
include/elf/mips.h
View File

@ -560,11 +560,11 @@ typedef union
typedef struct
{
/* Mask of general purpose registers used. */
unsigned long ri_gprmask;
uint32_t ri_gprmask;
/* Mask of co-processor registers used. */
unsigned long ri_cprmask[4];
uint32_t ri_cprmask[4];
/* GP register value for this object file. */
long ri_gp_value;
uint32_t ri_gp_value;
} Elf32_RegInfo;
/* The external version of the Elf_RegInfo structure. */
@ -1008,9 +1008,9 @@ typedef struct
/* Size of option descriptor, including header. */
unsigned char size;
/* Section index of affected section, or 0 for global option. */
unsigned short section;
uint16_t section;
/* Information specific to this kind of option. */
unsigned long info;
uint32_t info;
} Elf_Internal_Options;
/* MIPS ELF option header swapping routines. */
@ -1074,13 +1074,13 @@ typedef struct
typedef struct
{
/* Mask of general purpose registers used. */
unsigned long ri_gprmask;
uint32_t ri_gprmask;
/* Padding. */
unsigned long ri_pad;
uint32_t ri_pad;
/* Mask of co-processor registers used. */
unsigned long ri_cprmask[4];
uint32_t ri_cprmask[4];
/* GP register value for this object file. */
bfd_vma ri_gp_value;
uint64_t ri_gp_value;
} Elf64_Internal_RegInfo;
/* ABI Flags structure version 0. */