[lld] r236839 - [ARM] Check overflow of R_ARM_THM_CALL/JUMP24
Denis Protivensky
dprotivensky at accesssoftek.com
Fri May 8 05:34:43 PDT 2015
Author: denis-protivensky
Date: Fri May 8 07:34:43 2015
New Revision: 236839
URL: http://llvm.org/viewvc/llvm-project?rev=236839&view=rev
Log:
[ARM] Check overflow of R_ARM_THM_CALL/JUMP24
Modified:
lld/trunk/lib/ReaderWriter/ELF/ARM/ARMRelocationHandler.cpp
lld/trunk/test/elf/ARM/rel-thm-call.test
lld/trunk/test/elf/ARM/rel-thm-jump24.test
Modified: lld/trunk/lib/ReaderWriter/ELF/ARM/ARMRelocationHandler.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/ARM/ARMRelocationHandler.cpp?rev=236839&r1=236838&r2=236839&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/ELF/ARM/ARMRelocationHandler.cpp (original)
+++ lld/trunk/lib/ReaderWriter/ELF/ARM/ARMRelocationHandler.cpp Fri May 8 07:34:43 2015
@@ -200,6 +200,10 @@ static std::error_code relocR_ARM_PREL31
/// \brief Relocate B/BL instructions. useJs defines whether J1 & J2 are used
static std::error_code relocR_ARM_THM_B_L(uint8_t *location, uint32_t result,
bool useJs) {
+ if ((useJs && !llvm::isInt<25>((int32_t)result)) ||
+ (!useJs && !llvm::isInt<23>((int32_t)result)))
+ return make_out_of_range_reloc_error();
+
result = (result & 0x01FFFFFE) >> 1;
const uint16_t imm10 = (result >> 11) & 0x3FF;
Modified: lld/trunk/test/elf/ARM/rel-thm-call.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf/ARM/rel-thm-call.test?rev=236839&r1=236838&r2=236839&view=diff
==============================================================================
--- lld/trunk/test/elf/ARM/rel-thm-call.test (original)
+++ lld/trunk/test/elf/ARM/rel-thm-call.test Fri May 8 07:34:43 2015
@@ -1,5 +1,5 @@
# Check handling of R_ARM_THM_CALL relocation.
-# RUN: yaml2obj -format=elf %s > %t-o.o
+# RUN: yaml2obj -format=elf -docnum 1 %s > %t-o.o
# RUN: lld -flavor gnu -target arm -m armelf_linux_eabi -Bstatic \
# RUN: --noinhibit-exec %t-o.o -o %t
# RUN: llvm-objdump -s -t %t | FileCheck %s
@@ -13,6 +13,14 @@
# CHECK: 00400074 g F .text {{[0-9a-f]+}} _Z1fv
# CHECK: 00400080 g F .text {{[0-9a-f]+}} main
+# RUN: yaml2obj -format=elf -docnum 2 %s > %t-o.o
+# RUN: not lld -flavor gnu -target arm -m armelf_linux_eabi -Bstatic \
+# RUN: --noinhibit-exec %t-o.o -o %t 2> %t-error
+# RUN: FileCheck -check-prefix=OVERFLOW %s < %t-error
+
+# OVERFLOW: Relocation out of range {{.*}} (R_ARM_THM_CALL)
+
+# good.o
---
FileHeader:
Class: ELFCLASS32
@@ -29,6 +37,53 @@ Sections:
- Name: .rel.text
Type: SHT_REL
Link: .symtab
+ AddressAlign: 0x0000000000000004
+ Info: .text
+ Relocations:
+ - Offset: 0x0000000000000010
+ Symbol: _Z1fv
+ Type: R_ARM_THM_CALL
+ Addend: 0
+ - Name: .data
+ Type: SHT_PROGBITS
+ Flags: [ SHF_WRITE, SHF_ALLOC ]
+ AddressAlign: 0x0000000000000001
+ Content: ''
+ - Name: .bss
+ Type: SHT_NOBITS
+ Flags: [ SHF_WRITE, SHF_ALLOC ]
+ AddressAlign: 0x0000000000000001
+ Content: ''
+Symbols:
+ Global:
+ - Name: _Z1fv
+ Type: STT_FUNC
+ Section: .text
+ Value: 0x0000000000000001
+ Size: 0x000000000000000C
+ - Name: main
+ Type: STT_FUNC
+ Section: .text
+ Value: 0x000000000000000D
+ Size: 0x000000000000000E
+
+# overflow.o
+---
+FileHeader:
+ Class: ELFCLASS32
+ Data: ELFDATA2LSB
+ Type: ET_REL
+ Machine: EM_ARM
+ Flags: [ EF_ARM_EABI_VER5 ]
+Sections:
+ - Name: .text
+ Type: SHT_PROGBITS
+ Flags: [ SHF_ALLOC, SHF_EXECINSTR ]
+ AddressAlign: 0x0000000000000004
+ Content: 80B400AFBD465DF8047B704780B500AF00F400D00023184680BD00BF
+ - Name: .rel.text
+ Type: SHT_REL
+ Link: .symtab
AddressAlign: 0x0000000000000004
Info: .text
Relocations:
Modified: lld/trunk/test/elf/ARM/rel-thm-jump24.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf/ARM/rel-thm-jump24.test?rev=236839&r1=236838&r2=236839&view=diff
==============================================================================
--- lld/trunk/test/elf/ARM/rel-thm-jump24.test (original)
+++ lld/trunk/test/elf/ARM/rel-thm-jump24.test Fri May 8 07:34:43 2015
@@ -1,5 +1,5 @@
# Check handling of R_ARM_THM_JUMP24 relocation.
-# RUN: yaml2obj -format=elf %s > %t-o.o
+# RUN: yaml2obj -format=elf -docnum 1 %s > %t-o.o
# RUN: lld -flavor gnu -target arm -m armelf_linux_eabi -Bstatic \
# RUN: --noinhibit-exec %t-o.o -o %t
# RUN: llvm-objdump -s -t %t | FileCheck %s
@@ -13,6 +13,14 @@
# CHECK: 00400074 g F .text {{[0-9a-f]+}} _Z1fv
# CHECK: 00400084 g F .text {{[0-9a-f]+}} main
+# RUN: yaml2obj -format=elf -docnum 2 %s > %t-o.o
+# RUN: not lld -flavor gnu -target arm -m armelf_linux_eabi -Bstatic \
+# RUN: --noinhibit-exec %t-o.o -o %t 2> %t-error
+# RUN: FileCheck -check-prefix=OVERFLOW %s < %t-error
+
+# OVERFLOW: Relocation out of range {{.*}} (R_ARM_THM_JUMP24)
+
+# good.o
---
FileHeader:
Class: ELFCLASS32
@@ -29,6 +37,51 @@ Sections:
- Name: .rel.text
Type: SHT_REL
Link: .symtab
+ AddressAlign: 0x0000000000000004
+ Info: .text
+ Relocations:
+ - Offset: 0x0000000000000014
+ Symbol: _Z1fv
+ Type: R_ARM_THM_JUMP24
+ Addend: 0
+ - Name: .data
+ Type: SHT_PROGBITS
+ Flags: [ SHF_WRITE, SHF_ALLOC ]
+ AddressAlign: 0x0000000000000001
+ Content: ''
+ - Name: .bss
+ Type: SHT_NOBITS
+ Flags: [ SHF_WRITE, SHF_ALLOC ]
+ AddressAlign: 0x0000000000000001
+ Content: ''
+Symbols:
+ Global:
+ - Name: _Z1fv
+ Type: STT_FUNC
+ Section: .text
+ Value: 0x0000000000000001
+ - Name: main
+ Type: STT_FUNC
+ Section: .text
+ Value: 0x0000000000000011
+
+# overflow.o
+---
+FileHeader:
+ Class: ELFCLASS32
+ Data: ELFDATA2LSB
+ Type: ET_REL
+ Machine: EM_ARM
+ Flags: [ EF_ARM_EABI_VER5 ]
+Sections:
+ - Name: .text
+ Type: SHT_PROGBITS
+ Flags: [ SHF_ALLOC, SHF_EXECINSTR ]
+ AddressAlign: 0x0000000000000004
+ Content: 80B400AF00231846BD465DF8047B704780B500AF00F400900346184680BD00BF
+ - Name: .rel.text
+ Type: SHT_REL
+ Link: .symtab
AddressAlign: 0x0000000000000004
Info: .text
Relocations:
More information about the llvm-commits
mailing list