FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix seg-fault running strip on a corrupt binary.

Browse source 
PR binutils/20921
	* aoutx.h (squirt_out_relocs): Check for and report any relocs
	that could not be recognised.
This commit is contained in:
Nick Clifton 2016-12-05 14:32:30 +00:00
parent c28eeff2ea
commit e2996cc315
2 changed files with 27 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
bfd/ChangeLog
View file

@ -5,6 +5,10 @@
2016-12-05 Nick Clifton <nickc@redhat.com> 2016-12-05 Nick Clifton <nickc@redhat.com>
PR binutils/20921
* aoutx.h (squirt_out_relocs): Check for and report any relocs
that could not be recognised.
PR binutils/20922 PR binutils/20922
* elf.c (find_link): Check for null headers before attempting to * elf.c (find_link): Check for null headers before attempting to
match them. match them.

27
bfd/aoutx.h
View file

@ -1955,6 +1955,7 @@ NAME (aout, swap_std_reloc_out) (bfd *abfd,
PUT_WORD (abfd, g->address, natptr->r_address); PUT_WORD (abfd, g->address, natptr->r_address);
BFD_ASSERT (g->howto != NULL);
r_length = g->howto->size ; /* Size as a power of two. */ r_length = g->howto->size ; /* Size as a power of two. */
r_pcrel = (int) g->howto->pc_relative; /* Relative to PC? */ r_pcrel = (int) g->howto->pc_relative; /* Relative to PC? */
/* XXX This relies on relocs coming from a.out files. */ /* XXX This relies on relocs coming from a.out files. */
@ -2393,16 +2394,34 @@ NAME (aout, squirt_out_relocs) (bfd *abfd, asection *section)
for (natptr = native; for (natptr = native;
count != 0; count != 0;
--count, natptr += each_size, ++generic) --count, natptr += each_size, ++generic)
MY_swap_ext_reloc_out (abfd, *generic, {
(struct reloc_ext_external *) natptr); if ((*generic)->howto == NULL)
{
bfd_set_error (bfd_error_invalid_operation);
_bfd_error_handler (_("%B: attempt to write out unknown reloc type"), abfd);
return FALSE;
}
MY_swap_ext_reloc_out (abfd, *generic,
(struct reloc_ext_external *) natptr);
}
} }
else else
{ {
for (natptr = native; for (natptr = native;
count != 0; count != 0;
--count, natptr += each_size, ++generic) --count, natptr += each_size, ++generic)
MY_swap_std_reloc_out (abfd, *generic, {
(struct reloc_std_external *) natptr); /* PR 20921: If the howto field has not been initialised then skip
this reloc. */
if ((*generic)->howto == NULL)
{
bfd_set_error (bfd_error_invalid_operation);
_bfd_error_handler (_("%B: attempt to write out unknown reloc type"), abfd);
return FALSE;
}
MY_swap_std_reloc_out (abfd, *generic,
(struct reloc_std_external *) natptr);
}
} }
if (bfd_bwrite ((void *) native, natsize, abfd) != natsize) if (bfd_bwrite ((void *) native, natsize, abfd) != natsize)