OpenE2K/binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't call bfd_get_file_size in _bfd_generic_get_section_contents

Browse Source 
Since it is impossible to read beyond the end of normal files, we only
need to check archive element size in _bfd_generic_get_section_contents

	* libbfd.c (_bfd_generic_get_section_contents): Don't call
	bfd_get_file_size.  Check archive element size.
	(_bfd_generic_get_section_contents_in_window): Likewise.
This commit is contained in:
H.J. Lu 2017-06-28 11:07:04 -07:00
parent 47fdcf63c0
commit 328ce951b2
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bfd/ChangeLog
View File

@ -1,3 +1,9 @@
2017-06-28 H.J. Lu <hongjiu.lu@intel.com>
* libbfd.c (_bfd_generic_get_section_contents): Don't call
bfd_get_file_size. Check archive element size.
(_bfd_generic_get_section_contents_in_window): Likewise.
2017-06-28 H.J. Lu <hongjiu.lu@intel.com>
* bfd-in2.h: Regenerated.

17
bfd/libbfd.c
View File

@ -789,7 +789,6 @@ _bfd_generic_get_section_contents (bfd *abfd,
bfd_size_type count)
{
bfd_size_type sz;
ufile_ptr filesz;
if (count == 0)
return TRUE;
@ -812,10 +811,12 @@ _bfd_generic_get_section_contents (bfd *abfd,
sz = section->rawsize;
else
sz = section->size;
filesz = bfd_get_file_size (abfd);
if (offset + count < count
|| offset + count > sz
|| (ufile_ptr) section->filepos + offset + count > filesz)
|| (abfd->my_archive != NULL
&& !bfd_is_thin_archive (abfd->my_archive)
&& ((ufile_ptr) section->filepos + offset + count
> arelt_size (abfd))))
{
bfd_set_error (bfd_error_invalid_operation);
return FALSE;
@ -838,7 +839,6 @@ _bfd_generic_get_section_contents_in_window
{
#ifdef USE_MMAP
bfd_size_type sz;
ufile_ptr filesz;
if (count == 0)
return TRUE;
@ -871,9 +871,12 @@ _bfd_generic_get_section_contents_in_window
sz = section->rawsize;
else
sz = section->size;
filesz = bfd_get_file_size (abfd);
if (offset + count > sz
|| (ufile_ptr) section->filepos + offset + count > filesz
if (offset + count < count
|| offset + count > sz
|| (abfd->my_archive != NULL
&& !bfd_is_thin_archive (abfd->my_archive)
&& ((ufile_ptr) section->filepos + offset + count
> arelt_size (abfd)))
|| ! bfd_get_file_window (abfd, section->filepos + offset, count, w,
TRUE))
return FALSE;