This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
[patch] msp430: avoid overflow
- From: DJ Delorie <dj at redhat dot com>
- To: binutils at sourceware dot org
- Date: Tue, 20 May 2014 15:42:49 -0400
- Subject: [patch] msp430: avoid overflow
- Authentication-results: sourceware.org; auth=none
Avoid reading past the end of the local symbols array. Committed.
* elf32-msp430.c (msp430_elf_relax_adjust_locals): Avoid overflow.
diff --git a/bfd/elf32-msp430.c b/bfd/elf32-msp430.c
index c2d168c..2f55c53 100644
--- a/bfd/elf32-msp430.c
+++ b/bfd/elf32-msp430.c
@@ -1582,14 +1582,15 @@ msp430_elf_relax_adjust_locals (bfd * abfd, asection * sec, bfd_vma addr,
irelend = irel + sec->reloc_count;
symtab_hdr = & elf_tdata (abfd)->symtab_hdr;
isym = (Elf_Internal_Sym *) symtab_hdr->contents;
-
+
for (;irel < irelend; irel++)
{
- int sidx = ELF32_R_SYM(irel->r_info);
+ unsigned int sidx = ELF32_R_SYM(irel->r_info);
Elf_Internal_Sym *lsym = isym + sidx;
-
+
/* Adjust symbols referenced by .sec+0xXX */
- if (irel->r_addend > addr && irel->r_addend < toaddr
+ if (irel->r_addend > addr && irel->r_addend < toaddr
+ && sidx < symtab_hdr->sh_info
&& lsym->st_shndx == sec_shndx)
irel->r_addend -= count;
}