From ce43cce20339da6ffa7bc03430d7a8ed7348d1d6 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Wed, 11 Aug 1999 10:56:35 +0000 Subject: Check for overflow on R_ARM_PC24 relocs. --- bfd/ChangeLog | 5 +++++ bfd/elf32-arm.h | 12 +++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 645b1187417..13b8a665136 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,8 @@ +1999-08-11 Robin Farine + + * elf32-arm.h (elf32_arm_final_link_relocate): Check for overflow + in R_ARM_PC24 relocs. + Tue Aug 10 12:48:09 1999 Jeffrey A Law (law@cygnus.com) * elf-hppa.h (elf_hppa_fake_sections): New function. diff --git a/bfd/elf32-arm.h b/bfd/elf32-arm.h index 78ecae18b99..6b2cabd3729 100644 --- a/bfd/elf32-arm.h +++ b/bfd/elf32-arm.h @@ -1223,10 +1223,16 @@ elf32_arm_final_link_relocate (howto, input_bfd, output_bfd, value -= 8; } } + + /* Perform a signed range check. */ + signed_addend = value; + signed_addend >>= howto->rightshift; + if (signed_addend > ((bfd_signed_vma)(howto->dst_mask >> 1)) + || signed_addend < - ((bfd_signed_vma) ((howto->dst_mask + 1) >> 1))) + return bfd_reloc_overflow; - value >>= howto->rightshift; - value &= howto->dst_mask; - value |= (bfd_get_32 (input_bfd, hit_data) & (~ howto->dst_mask)); + value = (signed_addend & howto->dst_mask) + | (bfd_get_32 (input_bfd, hit_data) & (~ howto->dst_mask)); break; case R_ARM_ABS32: -- cgit v1.2.1