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

asan: arm-darwin: buffer overflow

Browse Source 
PR 21813
	* mach-o-arm.c (bfd_mach_o_arm_canonicalize_one_reloc): Sanity
	check PAIR reloc in other branch of condition as was done for
	PR21813.  Formatting.  Delete debug printf.
This commit is contained in:
Alan Modra
2021-10-24 18:36:03 +10:30
parent 3f9661f12a
commit e028124942
1 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
bfd/mach-o-arm.c
View File

@ -156,10 +156,7 @@ bfd_mach_o_arm_canonicalize_one_reloc (bfd * abfd,
bfd_mach_o_reloc_info reloc; bfd_mach_o_reloc_info reloc;
if (!bfd_mach_o_pre_canonicalize_one_reloc (abfd, raw, &reloc, res, syms)) if (!bfd_mach_o_pre_canonicalize_one_reloc (abfd, raw, &reloc, res, syms))
{
fprintf (stderr, "ARm 1\n");
return false; return false;
}
if (reloc.r_scattered) if (reloc.r_scattered)
{ {
@ -169,9 +166,9 @@ fprintf (stderr, "ARm 1\n");
/* PR 21813: Check for a corrupt PAIR reloc at the start. */ /* PR 21813: Check for a corrupt PAIR reloc at the start. */
if (res == res_base) if (res == res_base)
{ {
_bfd_error_handler (_("\ _bfd_error_handler (_("malformed mach-o ARM reloc pair: "
malformed mach-o ARM reloc pair: reloc is first reloc")); "reloc is first reloc"));
return false; return false;
} }
if (reloc.r_length == 2) if (reloc.r_length == 2)
{ {
@ -185,8 +182,8 @@ malformed mach-o ARM reloc pair: reloc is first reloc"));
res->address = res[-1].address; res->address = res[-1].address;
return true; return true;
} }
_bfd_error_handler (_("\ _bfd_error_handler (_("malformed mach-o ARM reloc pair: "
malformed mach-o ARM reloc pair: invalid length: %d"), reloc.r_length); "invalid length: %d"), reloc.r_length);
return false; return false;
case BFD_MACH_O_ARM_RELOC_SECTDIFF: case BFD_MACH_O_ARM_RELOC_SECTDIFF:
@ -200,8 +197,8 @@ malformed mach-o ARM reloc pair: invalid length: %d"), reloc.r_length);
res->howto = &arm_howto_table[8]; res->howto = &arm_howto_table[8];
return true; return true;
} }
_bfd_error_handler (_("\ _bfd_error_handler (_("malformed mach-o ARM sectdiff reloc: "
malformed mach-o ARM sectdiff reloc: invalid length: %d"), reloc.r_length); "invalid length: %d"), reloc.r_length);
return false; return false;
case BFD_MACH_O_ARM_RELOC_LOCAL_SECTDIFF: case BFD_MACH_O_ARM_RELOC_LOCAL_SECTDIFF:
@ -215,8 +212,8 @@ malformed mach-o ARM sectdiff reloc: invalid length: %d"), reloc.r_length);
res->howto = &arm_howto_table[9]; res->howto = &arm_howto_table[9];
return true; return true;
} }
_bfd_error_handler (_("\ _bfd_error_handler (_("malformed mach-o ARM local sectdiff reloc: "
malformed mach-o ARM local sectdiff reloc: invalid length: %d"), "invalid length: %d"),
reloc.r_length); reloc.r_length);
return false; return false;
@ -230,8 +227,8 @@ malformed mach-o ARM local sectdiff reloc: invalid length: %d"),
res->howto = &arm_howto_table[14]; res->howto = &arm_howto_table[14];
return true; return true;
} }
_bfd_error_handler (_("\ _bfd_error_handler (_("malformed mach-o ARM half sectdiff reloc: "
malformed mach-o ARM half sectdiff reloc: invalid length: %d"), "invalid length: %d"),
reloc.r_length); reloc.r_length);
return false; return false;
@ -262,8 +259,8 @@ malformed mach-o ARM half sectdiff reloc: invalid length: %d"),
res->howto = &arm_howto_table[3]; res->howto = &arm_howto_table[3];
return true; return true;
default: default:
_bfd_error_handler (_("\ _bfd_error_handler (_("malformed mach-o ARM vanilla reloc: "
malformed mach-o ARM vanilla reloc: invalid length: %d (pcrel: %d)"), "invalid length: %d (pcrel: %d)"),
reloc.r_length, reloc.r_pcrel); reloc.r_length, reloc.r_pcrel);
return false; return false;
} }
@ -299,6 +296,12 @@ malformed mach-o ARM vanilla reloc: invalid length: %d (pcrel: %d)"),
break; break;
case BFD_MACH_O_ARM_RELOC_PAIR: case BFD_MACH_O_ARM_RELOC_PAIR:
if (res == res_base)
{
_bfd_error_handler (_("malformed mach-o ARM reloc pair: "
"reloc is first reloc"));
return false;
}
if (res[-1].howto == &arm_howto_table[12] if (res[-1].howto == &arm_howto_table[12]
&& reloc.r_length == 0) && reloc.r_length == 0)
{ {
@ -326,8 +329,8 @@ malformed mach-o ARM vanilla reloc: invalid length: %d (pcrel: %d)"),
} }
} }
_bfd_error_handler (_("\ _bfd_error_handler (_("malformed mach-o ARM reloc: "
malformed mach-o ARM reloc: unknown reloc type: %d"), reloc.r_length); "unknown reloc type: %d"), reloc.r_length);
return false; return false;
} }