mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-28 17:11:11 -09:00
Code Issues Packages Projects Releases Wiki Activity

GP-164 Corrected ELF ARM R_ARM_REL32 (type 3) relocation processing

Browse Source
This commit is contained in:
ghidra1
2020-09-15 20:12:41 -04:00
parent 58f0b259b5
commit da92b68bcd
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Ghidra/Processors/ARM/src/main/java/ghidra/app/util/bin/format/elf/relocation/ARM_ElfRelocationHandler.java
View File

@@ -91,9 +91,10 @@ public class ARM_ElfRelocationHandler extends ElfRelocationHandler {
memory.setInt(relocationAddress, newValue); memory.setInt(relocationAddress, newValue);
break; break;
} }
case ARM_ElfRelocationConstants.R_ARM_REL32: { // // Target class: Data case ARM_ElfRelocationConstants.R_ARM_REL32: { // Target class: Data
newValue = (int) (symbolValue + addend); int oldValue = memory.getInt(relocationAddress);
newValue -= (offset + 8); // PC relative, PC will be 8 bytes after inst start newValue = (int) (symbolValue + addend + oldValue);
newValue -= offset; // PC relative
if (isThumb) { if (isThumb) {
newValue |= 1; newValue |= 1;
} }