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

readelf large memory allocation

Browse Source 
* elfcomm.h (setup_archive): Update prototype.
	* elfcomm.c (setup_archive): Add file_size parameter and sanity
	check longnames_size.
	(setup_nested_archive): Get file size and pass to setup_archive.
	* elfedit.c (process_archive): Likewise.
	* readelf.c (process_archive): Pass filedata->file_size to
	setup_archive.
This commit is contained in:
Alan Modra
2020-03-14 11:50:22 +10:30
parent f761cb13a9
commit 780f96aed2
5 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
binutils/elfcomm.c
View File

@@ -607,8 +607,8 @@ process_archive_index_and_symbols (struct archive_info * arch,
int
setup_archive (struct archive_info *arch, const char *file_name,
FILE *file, bfd_boolean is_thin_archive,
bfd_boolean read_symbols)
FILE *file, bfd_size_type file_size,
bfd_boolean is_thin_archive, bfd_boolean read_symbols)
{
size_t got;
@@ -671,7 +671,8 @@ setup_archive (struct archive_info *arch, const char *file_name,
return 1;
}
/* PR 17531: file: 639d6a26. */
if ((signed long) arch->longnames_size < 0)
if (arch->longnames_size > file_size
|| (signed long) arch->longnames_size < 0)
{
error (_("%s: long name table is too big, (size = 0x%lx)\n"),
file_name, arch->longnames_size);
@@ -713,6 +714,7 @@ setup_nested_archive (struct archive_info *nested_arch,
const char *member_file_name)
{
FILE * member_file;
struct stat statbuf;
/* Have we already setup this archive? */
if (nested_arch->file_name != NULL
@@ -727,8 +729,10 @@ setup_nested_archive (struct archive_info *nested_arch,
member_file = fopen (member_file_name, "rb");
if (member_file == NULL)
return 1;
if (fstat (fileno (member_file), &statbuf) < 0)
return 1;
return setup_archive (nested_arch, member_file_name, member_file,
FALSE, FALSE);
statbuf.st_size, FALSE, FALSE);
}
/* Release the memory used for the archive information. */