development/ghidra
development/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra synced 2024-10-13 05:33:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/patch'

Browse source
This commit is contained in:
ghidra1 2019-11-22 16:50:54 -05:00
parent f1fcd421d6 4fc507f711
commit 9a470a9dc7
2 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Ghidra/Processors/MIPS/src/main/java/ghidra/app/util/bin/format/elf/relocation/MIPS_ElfRelocationHandler.java
View file

@ -402,10 +402,9 @@ public class MIPS_ElfRelocationHandler extends ElfRelocationHandler {
break;
case MIPS_ElfRelocationConstants.R_MIPS_REL32:
// TODO: some guess-work was used here
// TODO: unsure if reloc valid for symbolIndex != 0
if (symbolIndex == 0) {
// TODO: may need to use relocation section load address if applicable
symbolValue = program.getImageBase().getOffset();
symbolValue = mipsRelocationContext.getImageBaseWordAdjustmentOffset();
}
value = (int) symbolValue;
value += mipsRelocationContext.extractAddend() ? oldValue : addend;

9
Ghidra/Processors/x86/src/main/java/ghidra/app/util/bin/format/elf/relocation/X86_64_ElfRelocationHandler.java
View file

@ -182,7 +182,7 @@ public class X86_64_ElfRelocationHandler extends ElfRelocationHandler {
value = symbolValue + dotgot + addend - offset;
memory.setInt(relocationAddress, (int) value);
break;
case X86_64_ElfRelocationConstants.R_X86_64_RELATIVE:
// word64 for LP64 and specifies word32 for ILP32,
// we assume LP64 only. We probably need a hybrid
@ -191,14 +191,13 @@ public class X86_64_ElfRelocationHandler extends ElfRelocationHandler {
// dl_machine.h
// value = (Elf64_64Addr) map->l_addr + reloc->r_addend
appliedSymbol = false; // symbol not used, symbolIndex of 0 expected
long base = program.getImageBase().getAddressableWordOffset();
long imageBaseAdjustment = elfRelocationContext.getImageBaseWordAdjustmentOffset();
if (elf.isPreLinked()) {
// adjust prelinked value that is already in memory
value = memory.getLong(relocationAddress) +
elfRelocationContext.getImageBaseWordAdjustmentOffset();
value = memory.getLong(relocationAddress) + imageBaseAdjustment;
}
else {
value = base + addend;
value = addend + imageBaseAdjustment;
}
memory.setLong(relocationAddress, value);
break;