Don't segfault in mips reloc special_functions
A symbol defined in a section from a shared library will have a NULL section->output_section during linking. * elf32-mips.c (gprel32_with_gp): Don't segfault on NULL symbol->section->output_section. * elf64-mips.c (mips_elf64_gprel32_reloc): Likewise. * elfn32-mips.c (mips_elf_gprel16_reloc): Likewise. (mips_elf_literal_reloc, mips_elf_gprel32_reloc): Likewise. (gprel32_with_gp, mips16_gprel_reloc): Likewise. * elfxx-mips.c (_bfd_mips_elf_gprel16_with_gp): Likewise. (_bfd_mips_elf_generic_reloc): Likewise.
This commit is contained in:
parent
a89e364b45
commit
75e73c6cad
@ -1858,8 +1858,11 @@ gprel32_with_gp (bfd *abfd, asymbol *symbol, arelent *reloc_entry,
|
||||
else
|
||||
relocation = symbol->value;
|
||||
|
||||
relocation += symbol->section->output_section->vma;
|
||||
relocation += symbol->section->output_offset;
|
||||
if (symbol->section->output_section != NULL)
|
||||
{
|
||||
relocation += symbol->section->output_section->vma;
|
||||
relocation += symbol->section->output_offset;
|
||||
}
|
||||
|
||||
if (!_bfd_mips_reloc_offset_in_range (abfd, input_section, reloc_entry,
|
||||
check_inplace))
|
||||
|
@ -3577,8 +3577,11 @@ mips_elf64_gprel32_reloc (bfd *abfd, arelent *reloc_entry, asymbol *symbol,
|
||||
else
|
||||
relocation = symbol->value;
|
||||
|
||||
relocation += symbol->section->output_section->vma;
|
||||
relocation += symbol->section->output_offset;
|
||||
if (symbol->section->output_section != NULL)
|
||||
{
|
||||
relocation += symbol->section->output_section->vma;
|
||||
relocation += symbol->section->output_offset;
|
||||
}
|
||||
|
||||
if (!_bfd_mips_reloc_offset_in_range (abfd, input_section, reloc_entry,
|
||||
check_inplace))
|
||||
|
@ -3300,7 +3300,8 @@ mips_elf_gprel16_reloc (bfd *abfd ATTRIBUTE_UNUSED, arelent *reloc_entry,
|
||||
else
|
||||
{
|
||||
relocatable = false;
|
||||
output_bfd = symbol->section->output_section->owner;
|
||||
if (symbol->section->output_section != NULL)
|
||||
output_bfd = symbol->section->output_section->owner;
|
||||
}
|
||||
|
||||
ret = mips_elf_final_gp (output_bfd, symbol, relocatable, error_message,
|
||||
@ -3340,7 +3341,8 @@ mips_elf_literal_reloc (bfd *abfd, arelent *reloc_entry, asymbol *symbol,
|
||||
else
|
||||
{
|
||||
relocatable = false;
|
||||
output_bfd = symbol->section->output_section->owner;
|
||||
if (symbol->section->output_section != NULL)
|
||||
output_bfd = symbol->section->output_section->owner;
|
||||
}
|
||||
|
||||
ret = mips_elf_final_gp (output_bfd, symbol, relocatable, error_message,
|
||||
@ -3383,7 +3385,8 @@ mips_elf_gprel32_reloc (bfd *abfd, arelent *reloc_entry, asymbol *symbol,
|
||||
else
|
||||
{
|
||||
relocatable = false;
|
||||
output_bfd = symbol->section->output_section->owner;
|
||||
if (symbol->section->output_section != NULL)
|
||||
output_bfd = symbol->section->output_section->owner;
|
||||
|
||||
ret = mips_elf_final_gp (output_bfd, symbol, relocatable,
|
||||
error_message, &gp);
|
||||
@ -3408,8 +3411,11 @@ gprel32_with_gp (bfd *abfd, asymbol *symbol, arelent *reloc_entry,
|
||||
else
|
||||
relocation = symbol->value;
|
||||
|
||||
relocation += symbol->section->output_section->vma;
|
||||
relocation += symbol->section->output_offset;
|
||||
if (symbol->section->output_section != NULL)
|
||||
{
|
||||
relocation += symbol->section->output_section->vma;
|
||||
relocation += symbol->section->output_offset;
|
||||
}
|
||||
|
||||
if (!bfd_reloc_offset_in_range (reloc_entry->howto, abfd, input_section,
|
||||
reloc_entry->address))
|
||||
@ -3484,7 +3490,8 @@ mips16_gprel_reloc (bfd *abfd, arelent *reloc_entry, asymbol *symbol,
|
||||
else
|
||||
{
|
||||
relocatable = false;
|
||||
output_bfd = symbol->section->output_section->owner;
|
||||
if (symbol->section->output_section != NULL)
|
||||
output_bfd = symbol->section->output_section->owner;
|
||||
}
|
||||
|
||||
ret = mips_elf_final_gp (output_bfd, symbol, relocatable, error_message,
|
||||
|
@ -2481,8 +2481,11 @@ _bfd_mips_elf_gprel16_with_gp (bfd *abfd, asymbol *symbol,
|
||||
else
|
||||
relocation = symbol->value;
|
||||
|
||||
relocation += symbol->section->output_section->vma;
|
||||
relocation += symbol->section->output_offset;
|
||||
if (symbol->section->output_section != NULL)
|
||||
{
|
||||
relocation += symbol->section->output_section->vma;
|
||||
relocation += symbol->section->output_offset;
|
||||
}
|
||||
|
||||
/* Set val to the offset into the section or symbol. */
|
||||
val = reloc_entry->addend;
|
||||
@ -2673,7 +2676,8 @@ _bfd_mips_elf_generic_reloc (bfd *abfd ATTRIBUTE_UNUSED, arelent *reloc_entry,
|
||||
|
||||
/* Build up the field adjustment in VAL. */
|
||||
val = 0;
|
||||
if (!relocatable || (symbol->flags & BSF_SECTION_SYM) != 0)
|
||||
if ((!relocatable || (symbol->flags & BSF_SECTION_SYM) != 0)
|
||||
&& symbol->section->output_section != NULL)
|
||||
{
|
||||
/* Either we're calculating the final field value or we have a
|
||||
relocation against a section symbol. Add in the section's
|
||||
|
Loading…
x
Reference in New Issue
Block a user