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

GP-699 Process ELF init/fini arrays before applying relocations

Browse Source
This commit is contained in:
ghidra1
2021-02-19 15:47:24 -05:00
parent a596bd465a
commit efa065ac4d
1 changed files with 11 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/ElfProgramBuilder.java
View File

@@ -158,8 +158,9 @@ class ElfProgramBuilder extends MemorySectionResolver implements ElfLoadHelper {
elf.getLoadAdapter().processElf(this, monitor);
processRelocations(monitor);
processEntryPoints(monitor);
processRelocations(monitor);
processImports(monitor);
monitor.setMessage("Processing PLT/GOT ...");
@@ -338,11 +339,10 @@ class ElfProgramBuilder extends MemorySectionResolver implements ElfLoadHelper {
/**
* Processes the GNU version section.
* @throws CancelledException
*/
private void processGNU(TaskMonitor monitor) {
if (monitor.isCancelled()) {
return;
}
private void processGNU(TaskMonitor monitor) throws CancelledException {
monitor.checkCanceled();
Address versionTableAddr = null;
@@ -464,10 +464,8 @@ class ElfProgramBuilder extends MemorySectionResolver implements ElfLoadHelper {
}
}
private void processEntryPoints(TaskMonitor monitor) {
if (monitor.isCancelled()) {
return;
}
private void processEntryPoints(TaskMonitor monitor) throws CancelledException {
monitor.checkCanceled();
monitor.setMessage("Creating entry points...");
long entry = elf.e_entry(); // already adjusted for pre-link
@@ -587,11 +585,8 @@ class ElfProgramBuilder extends MemorySectionResolver implements ElfLoadHelper {
return msg;
}
private void markupInterpreter(TaskMonitor monitor) {
if (monitor.isCancelled()) {
return;
}
private void markupInterpreter(TaskMonitor monitor) throws CancelledException {
monitor.checkCanceled();
monitor.setMessage("Processing interpreter...");
Address interpStrAddr = null;
@@ -621,10 +616,8 @@ class ElfProgramBuilder extends MemorySectionResolver implements ElfLoadHelper {
listing.setComment(interpStrAddr, CodeUnit.EOL_COMMENT, "Initial Elf program interpreter");
}
private void processImports(TaskMonitor monitor) {
if (monitor.isCancelled()) {
return;
}
private void processImports(TaskMonitor monitor) throws CancelledException {
monitor.checkCanceled();
monitor.setMessage("Processing imports...");
ExternalManager extManager = program.getExternalManager();