From 56ba7527d29060cf6e8693d6e772a9b9b53c1373 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Fri, 16 Dec 2022 21:37:29 +1030 Subject: bfd_get_relocated_section_contents allow NULL data buffer This patch removes the bfd_malloc in default_indirect_link_order and bfd_simple_get_relocated_section_contents, pushing the allocation down to bfd_get_relocated_section_contents. The idea is to make use of the allocation done with sanity checking in bfd_get_full_section_contents, which is called by bfd_generic_get_relocated_section_contents. Doing this exposed a bug in bfd_get_full_section_contents. With relaxation it is possible that an input section rawsize is different to the section size. In that case we want to use the larger of rawsize (the on-disk size for input sections) and size. * reloc.c (bfd_generic_get_relocated_section_contents), * reloc16.c (bfd_coff_reloc16_get_relocated_section_contents), * coff-alpha.c (alpha_ecoff_get_relocated_section_contents), * coff-sh.c (sh_coff_get_relocated_section_contents), * elf-m10200.c (mn10200_elf_get_relocated_section_contents), * elf-m10300.c (mn10300_elf_get_relocated_section_contents), * elf32-avr.c (elf32_avr_get_relocated_section_contents), * elf32-cr16.c (elf32_cr16_get_relocated_section_contents), * elf32-crx.c (elf32_crx_get_relocated_section_contents), * elf32-h8300.c (elf32_h8_get_relocated_section_contents), * elf32-nds32.c (nds32_elf_get_relocated_section_contents), * elf32-sh.c (sh_elf_get_relocated_section_contents), * elfxx-mips.c (_bfd_elf_mips_get_relocated_section_contents): Handle NULL data buffer. * bfd.c (bfd_get_section_alloc_size): New function. * bfd-in2.h: Regenerate. * compress.c (bfd_get_full_section_contents): Correct section malloc size. * linker.c (default_indirect_link_order): Don't malloc memory here before calling bfd_get_relocated_section_contents. * simple.c (bfd_simple_get_relocated_section_contents): Likewise. --- bfd/elf32-h8300.c | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'bfd/elf32-h8300.c') diff --git a/bfd/elf32-h8300.c b/bfd/elf32-h8300.c index 6c65520..5afb8a7 100644 --- a/bfd/elf32-h8300.c +++ b/bfd/elf32-h8300.c @@ -1623,6 +1623,13 @@ elf32_h8_get_relocated_section_contents (bfd *output_bfd, symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr; + bfd_byte *orig_data = data; + if (data == NULL) + { + data = bfd_malloc (input_section->size); + if (data == NULL) + return NULL; + } memcpy (data, elf_section_data (input_section)->this_hdr.contents, (size_t) input_section->size); @@ -1693,6 +1700,8 @@ elf32_h8_get_relocated_section_contents (bfd *output_bfd, free (isymbuf); if (elf_section_data (input_section)->relocs != internal_relocs) free (internal_relocs); + if (orig_data == NULL) + free (data); return NULL; } -- cgit v1.1