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

Revert "bfd: Always check sections with the corrupt size"

Browse Source 
This reverts commit e0f7ea91436dd308a094c4c101fd4169e8245a91.
This commit is contained in:
H.J. Lu
2021-11-04 08:07:09 -07:00
parent e0f7ea9143
commit 33d3e18ed7
1 changed files with 23 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
bfd/compress.c
View File

@ -232,7 +232,6 @@ bfd_get_full_section_contents (bfd *abfd, sec_ptr sec, bfd_byte **ptr)
bfd_size_type save_rawsize; bfd_size_type save_rawsize;
bfd_byte *compressed_buffer; bfd_byte *compressed_buffer;
unsigned int compression_header_size; unsigned int compression_header_size;
ufile_ptr filesize;
if (abfd->direction != write_direction && sec->rawsize != 0) if (abfd->direction != write_direction && sec->rawsize != 0)
sz = sec->rawsize; sz = sec->rawsize;
@ -244,37 +243,34 @@ bfd_get_full_section_contents (bfd *abfd, sec_ptr sec, bfd_byte **ptr)
return true; return true;
} }
filesize = bfd_get_file_size (abfd);
if (filesize > 0
&& filesize < sz
/* PR 24753: Linker created sections can be larger than
the file size, eg if they are being used to hold stubs. */
&& (bfd_section_flags (sec) & SEC_LINKER_CREATED) == 0
/* PR 24753: Sections which have no content should also be
excluded as they contain no size on disk. */
&& (bfd_section_flags (sec) & SEC_HAS_CONTENTS) != 0
/* PR 28530: Check compressed sections with the corrupt size. */
&& (sec->compress_status != COMPRESS_SECTION_NONE
/* The MMO file format supports its own special compression
technique, but it uses COMPRESS_SECTION_NONE when loading
a section's contents. */
|| bfd_get_flavour (abfd) != bfd_target_mmo_flavour))
{
/* PR 24708: Avoid attempts to allocate a ridiculous amount
of memory. */
bfd_set_error (bfd_error_file_truncated);
_bfd_error_handler
/* xgettext:c-format */
(_("error: %pB(%pA) section size (%#" PRIx64 " bytes) is larger than file size (%#" PRIx64 " bytes)"),
abfd, sec, (uint64_t) sz, (uint64_t) filesize);
return false;
}
switch (sec->compress_status) switch (sec->compress_status)
{ {
case COMPRESS_SECTION_NONE: case COMPRESS_SECTION_NONE:
if (p == NULL) if (p == NULL)
{ {
ufile_ptr filesize = bfd_get_file_size (abfd);
if (filesize > 0
&& filesize < sz
/* PR 24753: Linker created sections can be larger than
the file size, eg if they are being used to hold stubs. */
&& (bfd_section_flags (sec) & SEC_LINKER_CREATED) == 0
/* PR 24753: Sections which have no content should also be
excluded as they contain no size on disk. */
&& (bfd_section_flags (sec) & SEC_HAS_CONTENTS) != 0
/* The MMO file format supports its own special compression
technique, but it uses COMPRESS_SECTION_NONE when loading
a section's contents. */
&& bfd_get_flavour (abfd) != bfd_target_mmo_flavour)
{
/* PR 24708: Avoid attempts to allocate a ridiculous amount
of memory. */
bfd_set_error (bfd_error_file_truncated);
_bfd_error_handler
/* xgettext:c-format */
(_("error: %pB(%pA) section size (%#" PRIx64 " bytes) is larger than file size (%#" PRIx64 " bytes)"),
abfd, sec, (uint64_t) sz, (uint64_t) filesize);
return false;
}
p = (bfd_byte *) bfd_malloc (sz); p = (bfd_byte *) bfd_malloc (sz);
if (p == NULL) if (p == NULL)
{ {