aboutsummaryrefslogtreecommitdiff
path: root/bfd/mach-o-arm.c
diff options
context:
space:
mode:
authorNick Clifton <nickc@redhat.com>2017-07-24 13:49:22 +0100
committerNick Clifton <nickc@redhat.com>2017-07-24 13:49:22 +0100
commitca4cf9b9c622a5695e01f7f5815a7382a31fcf51 (patch)
treef2ecc74aa1b10a2cf2b651a32ad4378909234854 /bfd/mach-o-arm.c
parente8d84ca1b46f899b0b140fdd146fc7b14515267b (diff)
downloadgdb-ca4cf9b9c622a5695e01f7f5815a7382a31fcf51.zip
gdb-ca4cf9b9c622a5695e01f7f5815a7382a31fcf51.tar.gz
gdb-ca4cf9b9c622a5695e01f7f5815a7382a31fcf51.tar.bz2
Fix address violation errors parsing corrupt binary files.
PR 21813 binutils* rddbg.c (read_symbol_stabs_debugging_info): Check for an empty string whilst concatenating symbol names. bfd * mach-o.c (bfd_mach_o_canonicalize_relocs): Pass the base address of the relocs to the canonicalize_one_reloc routine. * mach-o.h (struct bfd_mach_o_backend_data): Update the prototype for the _bfd_mach_o_canonicalize_one_reloc field. * mach-o-arm.c (bfd_mach_o_arm_canonicalize_one_reloc): Add res_base parameter. Use to check for corrupt pair relocs. * mach-o-aarch64.c (bfd_mach_o_arm64_canonicalize_one_reloc): Likewise. * mach-o-i386.c (bfd_mach_o_i386_canonicalize_one_reloc): Likewise. * mach-o-x86-64.c (bfd_mach_o_x86_64_canonicalize_one_reloc): Likewise. * vms-alpha.c (_bfd_vms_slurp_eihd): Make sure that there is enough data in the record before attempting to parse it. (_bfd_vms_slurp_eeom): Likewise. (_bfd_vms_slurp_egsd): Check for an invalid section index. (image_set_ptr): Likewise. (alpha_vms_slurp_relocs): Likewise.
Diffstat (limited to 'bfd/mach-o-arm.c')
-rw-r--r--bfd/mach-o-arm.c13
1 files changed, 9 insertions, 4 deletions
diff --git a/bfd/mach-o-arm.c b/bfd/mach-o-arm.c
index 5139f79..9eb614c 100644
--- a/bfd/mach-o-arm.c
+++ b/bfd/mach-o-arm.c
@@ -30,7 +30,7 @@
#define bfd_mach_o_mkobject bfd_mach_o_arm_mkobject
#define bfd_mach_o_canonicalize_one_reloc bfd_mach_o_arm_canonicalize_one_reloc
-#define bfd_mach_o_swap_reloc_out NULL
+#define bfd_mach_o_swap_reloc_out NULL
#define bfd_mach_o_bfd_reloc_type_lookup bfd_mach_o_arm_bfd_reloc_type_lookup
#define bfd_mach_o_bfd_reloc_name_lookup bfd_mach_o_arm_bfd_reloc_name_lookup
@@ -147,9 +147,11 @@ static reloc_howto_type arm_howto_table[]=
};
static bfd_boolean
-bfd_mach_o_arm_canonicalize_one_reloc (bfd *abfd,
- struct mach_o_reloc_info_external *raw,
- arelent *res, asymbol **syms)
+bfd_mach_o_arm_canonicalize_one_reloc (bfd * abfd,
+ struct mach_o_reloc_info_external * raw,
+ arelent * res,
+ asymbol ** syms,
+ arelent * res_base)
{
bfd_mach_o_reloc_info reloc;
@@ -161,6 +163,9 @@ bfd_mach_o_arm_canonicalize_one_reloc (bfd *abfd,
switch (reloc.r_type)
{
case BFD_MACH_O_ARM_RELOC_PAIR:
+ /* PR 21813: Check for a corrupt PAIR reloc at the start. */
+ if (res == res_base)
+ return FALSE;
if (reloc.r_length == 2)
{
res->howto = &arm_howto_table[7];