yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-05 19:42:36 +02:00
Code Issues Releases Wiki Activity

GP-1097 Corrected ELF Import relocation error reporting when missing

Browse source 
relocation handler
This commit is contained in:
ghidra1 2021-07-02 12:27:33 -04:00
parent 879a249fb1
commit b3261c0634
1 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/ElfProgramBuilder.java
View file

@ -31,8 +31,7 @@ import ghidra.app.util.bin.format.MemoryLoadable;
import ghidra.app.util.bin.format.elf.*; import ghidra.app.util.bin.format.elf.*;
import ghidra.app.util.bin.format.elf.ElfDynamicType.ElfDynamicValueType; import ghidra.app.util.bin.format.elf.ElfDynamicType.ElfDynamicValueType;
import ghidra.app.util.bin.format.elf.extend.ElfLoadAdapter; import ghidra.app.util.bin.format.elf.extend.ElfLoadAdapter;
import ghidra.app.util.bin.format.elf.relocation.ElfRelocationContext; import ghidra.app.util.bin.format.elf.relocation.*;
import ghidra.app.util.bin.format.elf.relocation.ElfRelocationHandler;
import ghidra.app.util.importer.MessageLog; import ghidra.app.util.importer.MessageLog;
import ghidra.framework.options.Options; import ghidra.framework.options.Options;
import ghidra.framework.store.LockException; import ghidra.framework.store.LockException;
@ -732,19 +731,27 @@ class ElfProgramBuilder extends MemorySectionResolver implements ElfLoadHelper {
private void processRelocations(TaskMonitor monitor) throws CancelledException { private void processRelocations(TaskMonitor monitor) throws CancelledException {
monitor.setMessage("Processing relocation tables..."); monitor.setMessage("Processing relocation tables...");
ElfRelocationTable[] relocationTables = elf.getRelocationTables();
if (relocationTables.length == 0) {
return;
}
boolean processRelocations = ElfLoaderOptionsFactory.performRelocations(options); boolean processRelocations = ElfLoaderOptionsFactory.performRelocations(options);
if (processRelocations && ElfRelocationHandlerFactory.getHandler(elf) == null) {
log("ELF relocation handler extension not found! Unable to process relocations.");
}
Address defaultBase = getDefaultAddress(elf.adjustAddressForPrelink(0)); Address defaultBase = getDefaultAddress(elf.adjustAddressForPrelink(0));
AddressSpace defaultSpace = defaultBase.getAddressSpace(); AddressSpace defaultSpace = defaultBase.getAddressSpace();
long defaultBaseOffset = defaultBase.getAddressableWordOffset(); long defaultBaseOffset = defaultBase.getAddressableWordOffset();
int totalCount = 0; int totalCount = 0;
for (ElfRelocationTable relocationTable : elf.getRelocationTables()) { for (ElfRelocationTable relocationTable : relocationTables) {
totalCount += relocationTable.getRelocationCount(); totalCount += relocationTable.getRelocationCount();
} }
monitor.initialize(totalCount); monitor.initialize(totalCount);
for (ElfRelocationTable relocationTable : elf.getRelocationTables()) { for (ElfRelocationTable relocationTable : relocationTables) {
monitor.checkCanceled(); monitor.checkCanceled();
@ -877,7 +884,7 @@ class ElfProgramBuilder extends MemorySectionResolver implements ElfLoadHelper {
memory.getBytes(relocAddr, bytes); memory.getBytes(relocAddr, bytes);
if (context != null && context.hasRelocationHandler()) { if (context != null) {
if (relrTypeUnknown) { if (relrTypeUnknown) {
ElfRelocationHandler.markAsUnsupportedRelr(program, relocAddr); ElfRelocationHandler.markAsUnsupportedRelr(program, relocAddr);
} }