mirrors/binutils-gdb
1
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2024-11-23 18:14:13 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

asan: NULL deref in alpha_ecoff_get_relocated_section_contents

Browse Source 
This fixes some holes found by fuzzers, and removes aborts that can be
triggered by user input to objdump.  Abort should only be used within
bfd to show programming errors in bfd.

	* coff-alpha.c (alpha_ecoff_get_relocated_section_contents): Handle
	NULL howto.  Don't abort on stack errors or on unexpected relocs.
	Show more bfd reloc status messages.
This commit is contained in:
Alan Modra 2023-10-24 13:17:50 +10:30
parent f959280488
commit e3afa68558
1 changed files with 47 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
bfd/coff-alpha.c
View File

@ -815,10 +815,20 @@ alpha_ecoff_get_relocated_section_contents (bfd *abfd,
arelent *rel; arelent *rel;
bfd_reloc_status_type r; bfd_reloc_status_type r;
char *err; char *err;
unsigned int r_type;
rel = *relp; rel = *relp;
r = bfd_reloc_ok; if (rel->howto == NULL)
switch (rel->howto->type) {
r = bfd_reloc_notsupported;
r_type = ALPHA_R_IGNORE;
}
else
{
r = bfd_reloc_ok;
r_type = rel->howto->type;
}
switch (r_type)
{ {
case ALPHA_R_IGNORE: case ALPHA_R_IGNORE:
rel->address += input_section->output_offset; rel->address += input_section->output_offset;
@ -985,7 +995,10 @@ alpha_ecoff_get_relocated_section_contents (bfd *abfd,
relocation += rel->addend; relocation += rel->addend;
if (tos >= RELOC_STACKSIZE) if (tos >= RELOC_STACKSIZE)
abort (); {
r = bfd_reloc_notsupported;
break;
}
stack[tos++] = relocation; stack[tos++] = relocation;
} }
@ -1004,7 +1017,10 @@ alpha_ecoff_get_relocated_section_contents (bfd *abfd,
} }
if (tos == 0) if (tos == 0)
abort (); {
r = bfd_reloc_notsupported;
break;
}
/* The offset and size for this reloc are encoded into the /* The offset and size for this reloc are encoded into the
addend field by alpha_adjust_reloc_in. */ addend field by alpha_adjust_reloc_in. */
@ -1045,7 +1061,10 @@ alpha_ecoff_get_relocated_section_contents (bfd *abfd,
relocation += rel->addend; relocation += rel->addend;
if (tos == 0) if (tos == 0)
abort (); {
r = bfd_reloc_notsupported;
break;
}
stack[tos - 1] -= relocation; stack[tos - 1] -= relocation;
} }
@ -1078,7 +1097,10 @@ alpha_ecoff_get_relocated_section_contents (bfd *abfd,
relocation += rel->addend; relocation += rel->addend;
if (tos == 0) if (tos == 0)
abort (); {
r = bfd_reloc_notsupported;
break;
}
stack[tos - 1] >>= relocation; stack[tos - 1] >>= relocation;
} }
@ -1091,7 +1113,8 @@ alpha_ecoff_get_relocated_section_contents (bfd *abfd,
break; break;
default: default:
abort (); r = bfd_reloc_notsupported;
break;
} }
if (relocatable) if (relocatable)
@ -1123,15 +1146,30 @@ alpha_ecoff_get_relocated_section_contents (bfd *abfd,
input_section, rel->address); input_section, rel->address);
break; break;
case bfd_reloc_outofrange: case bfd_reloc_outofrange:
(*link_info->callbacks->einfo)
/* xgettext:c-format */
(_("%X%P: %pB(%pA): relocation \"%pR\" goes out of range\n"),
abfd, input_section, rel);
goto error_return;
case bfd_reloc_notsupported:
(*link_info->callbacks->einfo)
/* xgettext:c-format */
(_("%X%P: %pB(%pA): relocation \"%pR\" is not supported\n"),
abfd, input_section, rel);
goto error_return;
default: default:
abort (); (*link_info->callbacks->einfo)
/* xgettext:c-format */
(_("%X%P: %pB(%pA): relocation \"%pR\""
" returns an unrecognized value %x\n"),
abfd, input_section, rel, r);
break; break;
} }
} }
} }
if (tos != 0) if (tos != 0)
abort (); goto error_return;
successful_return: successful_return:
free (reloc_vector); free (reloc_vector);