This is the mail archive of the
binutils@sources.redhat.com
mailing list for the binutils project.
fix a multi-toc related ppc64 segfault
- From: Alan Modra <amodra at bigpond dot net dot au>
- To: binutils at sources dot redhat dot com
- Cc: Olaf Hering <olh at suse dot de>
- Date: Fri, 20 Jun 2003 22:05:05 +0930
- Subject: fix a multi-toc related ppc64 segfault
We build htab->stub_group, an array indexed by section id, before any
stub sections have been added. Consequently, if a symbol gets defined
in a stub section as can happen in ppc_build_one_stub for
ppc_stub_plt_call, its section id will be too big for the array.
* elf64-ppc.c (struct ppc_link_hash_table): Add top_id.
(ppc64_elf_setup_section_lists): Set it.
(ppc64_elf_relocate_section): Check sym section id against top_id.
(ppc_build_one_stub): Comment on top_id.
Index: bfd/elf64-ppc.c
===================================================================
RCS file: /cvs/src/src/bfd/elf64-ppc.c,v
retrieving revision 1.113
diff -u -p -r1.113 elf64-ppc.c
--- bfd/elf64-ppc.c 20 Jun 2003 05:30:45 -0000 1.113
+++ bfd/elf64-ppc.c 20 Jun 2003 12:28:43 -0000
@@ -2708,6 +2708,9 @@ struct ppc_link_hash_table
/* Temp used when calculating TOC pointers. */
bfd_vma toc_curr;
+ /* Highest input section id. */
+ int top_id;
+
/* Highest output section index. */
int top_index;
@@ -6114,7 +6117,9 @@ ppc_build_one_stub (struct bfd_hash_entr
{
/* Point the symbol at the stub. There may be multiple stubs,
we don't really care; The main thing is to make this sym
- defined somewhere. */
+ defined somewhere. Maybe defining the symbol in the stub
+ section is a silly idea. If we didn't do this, htab->top_id
+ could disappear. */
stub_entry->h->oh->root.type = bfd_link_hash_defined;
stub_entry->h->oh->root.u.def.section = stub_entry->stub_sec;
stub_entry->h->oh->root.u.def.value = stub_entry->stub_offset;
@@ -6285,6 +6290,7 @@ ppc64_elf_setup_section_lists (bfd *outp
}
}
+ htab->top_id = top_id;
amt = sizeof (struct map_stub) * (top_id + 1);
htab->stub_group = bfd_zmalloc (amt);
if (htab->stub_group == NULL)
@@ -8314,6 +8320,7 @@ ppc64_elf_relocate_section (bfd *output_
if ((relocation + addend - from + max_br_offset >= 2 * max_br_offset
|| (sec != NULL
&& sec->output_section != NULL
+ && sec->id <= htab->top_id
&& (htab->stub_group[sec->id].toc_off
!= htab->stub_group[input_section->id].toc_off)))
&& (stub_entry = ppc_get_stub_entry (input_section, sec, h,
--
Alan Modra
IBM OzLabs - Linux Technology Centre