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

_bfd_elf_slurp_version_tables tidy

Browse Source 
The internal verref buffer is allocated with bfd_zalloc, based on a
count given in headers.  If the headers are broken/fuzzed and contain
an enormous count the alloc can result in OOM.  If we first read the
external verrefs (into a buffer that isn't zeroed on allocation) then
the read provides a sanity check on the headers.

Also prints an error for version info that fails other sanity checks.

	* elf.c (_bfd_elf_slurp_version_tables): Delay allocation of
	internal verref buffer.  Error for zero sh_info.  Print errors.
	Check for zero vd_ndx.  Use bfd_zalloc for vd_auxptr buffer.
This commit is contained in:
Alan Modra
2014-11-19 19:10:49 +10:30
parent a3e60ddb0b
commit 601a03ba3d
2 changed files with 52 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bfd/ChangeLog
View File

@ -1,3 +1,9 @@
2014-11-26 Alan Modra <amodra@gmail.com>
* elf.c (_bfd_elf_slurp_version_tables): Delay allocation of
internal verref buffer. Error for zero sh_info. Print errors.
Check for zero vd_ndx. Use bfd_zalloc for vd_auxptr buffer.
2014-11-25 H.J. Lu <hongjiu.lu@intel.com> 2014-11-25 H.J. Lu <hongjiu.lu@intel.com>
* targets.c (BFD_JUMP_TABLE_SYMBOLS): Use * targets.c (BFD_JUMP_TABLE_SYMBOLS): Use

89
bfd/elf.c
View File

@ -7285,30 +7285,31 @@ _bfd_elf_slurp_version_tables (bfd *abfd, bfd_boolean default_imported_symver)
hdr = &elf_tdata (abfd)->dynverref_hdr; hdr = &elf_tdata (abfd)->dynverref_hdr;
if (hdr->sh_info) if (hdr->sh_info == 0 || hdr->sh_size < sizeof (Elf_External_Verneed))
elf_tdata (abfd)->verref = (Elf_Internal_Verneed *)
bfd_zalloc2 (abfd, hdr->sh_info, sizeof (Elf_Internal_Verneed));
else
elf_tdata (abfd)->verref = NULL;
if (elf_tdata (abfd)->verref == NULL)
goto error_return;
elf_tdata (abfd)->cverrefs = hdr->sh_info;
contents = (bfd_byte *) bfd_malloc (hdr->sh_size);
if (contents == NULL)
{ {
error_return_bad_verref:
(*_bfd_error_handler)
(_("%B: .gnu.version_r invalid entry"), abfd);
bfd_set_error (bfd_error_bad_value);
error_return_verref: error_return_verref:
elf_tdata (abfd)->verref = NULL; elf_tdata (abfd)->verref = NULL;
elf_tdata (abfd)->cverrefs = 0; elf_tdata (abfd)->cverrefs = 0;
goto error_return; goto error_return;
} }
contents = (bfd_byte *) bfd_malloc (hdr->sh_size);
if (contents == NULL)
goto error_return_verref;
if (bfd_seek (abfd, hdr->sh_offset, SEEK_SET) != 0 if (bfd_seek (abfd, hdr->sh_offset, SEEK_SET) != 0
|| bfd_bread (contents, hdr->sh_size, abfd) != hdr->sh_size) || bfd_bread (contents, hdr->sh_size, abfd) != hdr->sh_size)
goto error_return_verref; goto error_return_verref;
if (hdr->sh_info && hdr->sh_size < sizeof (Elf_External_Verneed)) elf_tdata (abfd)->cverrefs = hdr->sh_info;
elf_tdata (abfd)->verref = (Elf_Internal_Verneed *)
bfd_zalloc2 (abfd, hdr->sh_info, sizeof (Elf_Internal_Verneed));
if (elf_tdata (abfd)->verref == NULL)
goto error_return_verref; goto error_return_verref;
BFD_ASSERT (sizeof (Elf_External_Verneed) BFD_ASSERT (sizeof (Elf_External_Verneed)
@ -7330,7 +7331,7 @@ error_return_verref:
bfd_elf_string_from_elf_section (abfd, hdr->sh_link, bfd_elf_string_from_elf_section (abfd, hdr->sh_link,
iverneed->vn_file); iverneed->vn_file);
if (iverneed->vn_filename == NULL) if (iverneed->vn_filename == NULL)
goto error_return_verref; goto error_return_bad_verref;
if (iverneed->vn_cnt == 0) if (iverneed->vn_cnt == 0)
iverneed->vn_auxptr = NULL; iverneed->vn_auxptr = NULL;
@ -7345,7 +7346,7 @@ error_return_verref:
if (iverneed->vn_aux if (iverneed->vn_aux
> (size_t) (contents_end - (bfd_byte *) everneed)) > (size_t) (contents_end - (bfd_byte *) everneed))
goto error_return_verref; goto error_return_bad_verref;
evernaux = ((Elf_External_Vernaux *) evernaux = ((Elf_External_Vernaux *)
((bfd_byte *) everneed + iverneed->vn_aux)); ((bfd_byte *) everneed + iverneed->vn_aux));
@ -7358,7 +7359,7 @@ error_return_verref:
bfd_elf_string_from_elf_section (abfd, hdr->sh_link, bfd_elf_string_from_elf_section (abfd, hdr->sh_link,
ivernaux->vna_name); ivernaux->vna_name);
if (ivernaux->vna_nodename == NULL) if (ivernaux->vna_nodename == NULL)
goto error_return_verref; goto error_return_bad_verref;
if (j + 1 < iverneed->vn_cnt) if (j + 1 < iverneed->vn_cnt)
ivernaux->vna_nextptr = ivernaux + 1; ivernaux->vna_nextptr = ivernaux + 1;
@ -7367,7 +7368,7 @@ error_return_verref:
if (ivernaux->vna_next if (ivernaux->vna_next
> (size_t) (contents_end - (bfd_byte *) evernaux)) > (size_t) (contents_end - (bfd_byte *) evernaux))
goto error_return_verref; goto error_return_bad_verref;
evernaux = ((Elf_External_Vernaux *) evernaux = ((Elf_External_Vernaux *)
((bfd_byte *) evernaux + ivernaux->vna_next)); ((bfd_byte *) evernaux + ivernaux->vna_next));
@ -7383,7 +7384,7 @@ error_return_verref:
if (iverneed->vn_next if (iverneed->vn_next
> (size_t) (contents_end - (bfd_byte *) everneed)) > (size_t) (contents_end - (bfd_byte *) everneed))
goto error_return_verref; goto error_return_bad_verref;
everneed = ((Elf_External_Verneed *) everneed = ((Elf_External_Verneed *)
((bfd_byte *) everneed + iverneed->vn_next)); ((bfd_byte *) everneed + iverneed->vn_next));
@ -7406,15 +7407,24 @@ error_return_verref:
hdr = &elf_tdata (abfd)->dynverdef_hdr; hdr = &elf_tdata (abfd)->dynverdef_hdr;
if (hdr->sh_info == 0 || hdr->sh_size < sizeof (Elf_External_Verdef))
{
error_return_bad_verdef:
(*_bfd_error_handler)
(_("%B: .gnu.version_d invalid entry"), abfd);
bfd_set_error (bfd_error_bad_value);
error_return_verdef:
elf_tdata (abfd)->verdef = NULL;
elf_tdata (abfd)->cverdefs = 0;
goto error_return;
}
contents = (bfd_byte *) bfd_malloc (hdr->sh_size); contents = (bfd_byte *) bfd_malloc (hdr->sh_size);
if (contents == NULL) if (contents == NULL)
goto error_return; goto error_return_verdef;
if (bfd_seek (abfd, hdr->sh_offset, SEEK_SET) != 0 if (bfd_seek (abfd, hdr->sh_offset, SEEK_SET) != 0
|| bfd_bread (contents, hdr->sh_size, abfd) != hdr->sh_size) || bfd_bread (contents, hdr->sh_size, abfd) != hdr->sh_size)
goto error_return; goto error_return_verdef;
if (hdr->sh_info && hdr->sh_size < sizeof (Elf_External_Verdef))
goto error_return;
BFD_ASSERT (sizeof (Elf_External_Verdef) BFD_ASSERT (sizeof (Elf_External_Verdef)
>= sizeof (Elf_External_Verdaux)); >= sizeof (Elf_External_Verdaux));
@ -7432,12 +7442,14 @@ error_return_verref:
{ {
_bfd_elf_swap_verdef_in (abfd, everdef, &iverdefmem); _bfd_elf_swap_verdef_in (abfd, everdef, &iverdefmem);
if ((iverdefmem.vd_ndx & ((unsigned) VERSYM_VERSION)) == 0)
goto error_return_bad_verdef;
if ((iverdefmem.vd_ndx & ((unsigned) VERSYM_VERSION)) > maxidx) if ((iverdefmem.vd_ndx & ((unsigned) VERSYM_VERSION)) > maxidx)
maxidx = iverdefmem.vd_ndx & ((unsigned) VERSYM_VERSION); maxidx = iverdefmem.vd_ndx & ((unsigned) VERSYM_VERSION);
if (iverdefmem.vd_next if (iverdefmem.vd_next
> (size_t) (contents_end_def - (bfd_byte *) everdef)) > (size_t) (contents_end_def - (bfd_byte *) everdef))
goto error_return; goto error_return_bad_verdef;
everdef = ((Elf_External_Verdef *) everdef = ((Elf_External_Verdef *)
((bfd_byte *) everdef + iverdefmem.vd_next)); ((bfd_byte *) everdef + iverdefmem.vd_next));
@ -7450,14 +7462,11 @@ error_return_verref:
else else
freeidx = ++maxidx; freeidx = ++maxidx;
} }
if (maxidx)
elf_tdata (abfd)->verdef = (Elf_Internal_Verdef *)
bfd_zalloc2 (abfd, maxidx, sizeof (Elf_Internal_Verdef));
else
elf_tdata (abfd)->verdef = NULL;
elf_tdata (abfd)->verdef = (Elf_Internal_Verdef *)
bfd_zalloc2 (abfd, maxidx, sizeof (Elf_Internal_Verdef));
if (elf_tdata (abfd)->verdef == NULL) if (elf_tdata (abfd)->verdef == NULL)
goto error_return; goto error_return_verdef;
elf_tdata (abfd)->cverdefs = maxidx; elf_tdata (abfd)->cverdefs = maxidx;
@ -7472,12 +7481,7 @@ error_return_verref:
_bfd_elf_swap_verdef_in (abfd, everdef, &iverdefmem); _bfd_elf_swap_verdef_in (abfd, everdef, &iverdefmem);
if ((iverdefmem.vd_ndx & VERSYM_VERSION) == 0) if ((iverdefmem.vd_ndx & VERSYM_VERSION) == 0)
{ goto error_return_bad_verdef;
error_return_verdef:
elf_tdata (abfd)->verdef = NULL;
elf_tdata (abfd)->cverdefs = 0;
goto error_return;
}
iverdef = &iverdefarr[(iverdefmem.vd_ndx & VERSYM_VERSION) - 1]; iverdef = &iverdefarr[(iverdefmem.vd_ndx & VERSYM_VERSION) - 1];
memcpy (iverdef, &iverdefmem, sizeof (Elf_Internal_Verdef)); memcpy (iverdef, &iverdefmem, sizeof (Elf_Internal_Verdef));
@ -7497,7 +7501,7 @@ error_return_verdef:
if (iverdef->vd_aux if (iverdef->vd_aux
> (size_t) (contents_end_aux - (bfd_byte *) everdef)) > (size_t) (contents_end_aux - (bfd_byte *) everdef))
goto error_return_verdef; goto error_return_bad_verdef;
everdaux = ((Elf_External_Verdaux *) everdaux = ((Elf_External_Verdaux *)
((bfd_byte *) everdef + iverdef->vd_aux)); ((bfd_byte *) everdef + iverdef->vd_aux));
@ -7510,7 +7514,7 @@ error_return_verdef:
bfd_elf_string_from_elf_section (abfd, hdr->sh_link, bfd_elf_string_from_elf_section (abfd, hdr->sh_link,
iverdaux->vda_name); iverdaux->vda_name);
if (iverdaux->vda_nodename == NULL) if (iverdaux->vda_nodename == NULL)
goto error_return_verdef; goto error_return_bad_verdef;
if (j + 1 < iverdef->vd_cnt) if (j + 1 < iverdef->vd_cnt)
iverdaux->vda_nextptr = iverdaux + 1; iverdaux->vda_nextptr = iverdaux + 1;
@ -7519,7 +7523,7 @@ error_return_verdef:
if (iverdaux->vda_next if (iverdaux->vda_next
> (size_t) (contents_end_aux - (bfd_byte *) everdaux)) > (size_t) (contents_end_aux - (bfd_byte *) everdaux))
goto error_return_verdef; goto error_return_bad_verdef;
everdaux = ((Elf_External_Verdaux *) everdaux = ((Elf_External_Verdaux *)
((bfd_byte *) everdaux + iverdaux->vda_next)); ((bfd_byte *) everdaux + iverdaux->vda_next));
@ -7574,14 +7578,13 @@ error_return_verdef:
if (iverdef->vd_nodename == NULL) if (iverdef->vd_nodename == NULL)
goto error_return_verdef; goto error_return_verdef;
iverdef->vd_nextdef = NULL; iverdef->vd_nextdef = NULL;
iverdef->vd_auxptr = (struct elf_internal_verdaux *) iverdef->vd_auxptr = ((struct elf_internal_verdaux *)
bfd_alloc (abfd, sizeof (Elf_Internal_Verdaux)); bfd_zalloc (abfd, sizeof (Elf_Internal_Verdaux)));
if (iverdef->vd_auxptr == NULL) if (iverdef->vd_auxptr == NULL)
goto error_return_verdef; goto error_return_verdef;
iverdaux = iverdef->vd_auxptr; iverdaux = iverdef->vd_auxptr;
iverdaux->vda_nodename = iverdef->vd_nodename; iverdaux->vda_nodename = iverdef->vd_nodename;
iverdaux->vda_nextptr = NULL;
} }
return TRUE; return TRUE;