diff options
| author | Alan Modra <amodra@bigpond.net.au> | 2012-05-16 03:35:28 +0000 |
|---|---|---|
| committer | Alan Modra <amodra@bigpond.net.au> | 2012-05-16 03:35:28 +0000 |
| commit | 91a0f9c436b3bc1ae57993a03454c68f595b7261 (patch) | |
| tree | 06a5eef73807977cf47c2bb3aaf3e46d1756a77e /bfd/elf.c | |
| parent | cadc8a0c38e69566da6bcf71a792fa21cc5b7964 (diff) | |
| download | gdb-91a0f9c436b3bc1ae57993a03454c68f595b7261.tar.gz | |
PR ld/13962
PR ld/7023
* elf.c (bfd_section_from_shdr): Fail when .dynsym sh_info is
out of range. As a special case, fix sh_info for zero sh_size.
Do the same for .symtab.
Diffstat (limited to 'bfd/elf.c')
| -rw-r--r-- | bfd/elf.c | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/bfd/elf.c b/bfd/elf.c index 9481c0e1d56..7acf1422e5d 100644 --- a/bfd/elf.c +++ b/bfd/elf.c @@ -1646,7 +1646,15 @@ bfd_section_from_shdr (bfd *abfd, unsigned int shindex) if (hdr->sh_entsize != bed->s->sizeof_sym) return FALSE; if (hdr->sh_info * hdr->sh_entsize > hdr->sh_size) - return FALSE; + { + if (hdr->sh_size != 0) + return FALSE; + /* Some assemblers erroneously set sh_info to one with a + zero sh_size. ld sees this as a global symbol count + of (unsigned) -1. Fix it here. */ + hdr->sh_info = 0; + return TRUE; + } BFD_ASSERT (elf_onesymtab (abfd) == 0); elf_onesymtab (abfd) = shindex; elf_tdata (abfd)->symtab_hdr = *hdr; @@ -1699,6 +1707,16 @@ bfd_section_from_shdr (bfd *abfd, unsigned int shindex) if (hdr->sh_entsize != bed->s->sizeof_sym) return FALSE; + if (hdr->sh_info * hdr->sh_entsize > hdr->sh_size) + { + if (hdr->sh_size != 0) + return FALSE; + /* Some linkers erroneously set sh_info to one with a + zero sh_size. ld sees this as a global symbol count + of (unsigned) -1. Fix it here. */ + hdr->sh_info = 0; + return TRUE; + } BFD_ASSERT (elf_dynsymtab (abfd) == 0); elf_dynsymtab (abfd) = shindex; elf_tdata (abfd)->dynsymtab_hdr = *hdr; |