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

Merge remote-tracking branch 'origin/GP-2587_InjectionErrorHandling'

Browse Source
This commit is contained in:
Ryan Kurtz
2023-02-21 12:40:49 -05:00
parent b3a7f0ba08 e996440c77
commit fece9ce5f7
9 changed files with 240 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/stack/SymPcodeExecutor.java
View File

@@ -15,6 +15,7 @@
*/
package ghidra.app.plugin.core.debug.stack;
import java.io.IOException;
import java.util.*;
import ghidra.app.decompiler.DecompInterface;
@@ -28,8 +29,10 @@ import ghidra.program.model.address.Address;
import ghidra.program.model.data.*;
import ghidra.program.model.lang.*;
import ghidra.program.model.listing.*;
import ghidra.program.model.mem.MemoryAccessException;
import ghidra.program.model.pcode.*;
import ghidra.util.exception.InvalidInputException;
import ghidra.util.exception.NotFoundException;
import ghidra.util.task.TaskMonitor;
/**
@@ -68,8 +71,8 @@ class SymPcodeExecutor extends PcodeExecutor<Sym> {
CompilerSpec cSpec = program.getCompilerSpec();
SleighLanguage language = (SleighLanguage) cSpec.getLanguage();
SymPcodeArithmetic arithmetic = new SymPcodeArithmetic(cSpec);
return new SymPcodeExecutor(program, cSpec, language, arithmetic, state, reason,
warnings, monitor);
return new SymPcodeExecutor(program, cSpec, language, arithmetic, state, reason, warnings,
monitor);
}
private final Program program;
@@ -93,8 +96,7 @@ class SymPcodeExecutor extends PcodeExecutor<Sym> {
}
@Override
public void executeCallother(PcodeOp op, PcodeFrame frame,
PcodeUseropLibrary<Sym> library) {
public void executeCallother(PcodeOp op, PcodeFrame frame, PcodeUseropLibrary<Sym> library) {
// Do nothing
// TODO: Is there a way to know if a userop affects the stack?
}
@@ -120,8 +122,7 @@ class SymPcodeExecutor extends PcodeExecutor<Sym> {
}
int extrapop = convention.getExtrapop();
if (extrapop == PrototypeModel.UNKNOWN_EXTRAPOP) {
throw new PcodeExecutionException(
"Cannot get stack change for function " + function);
throw new PcodeExecutionException("Cannot get stack change for function " + function);
}
if (function.isStackPurgeSizeValid()) {
return extrapop + function.getStackPurgeSize();
@@ -151,9 +152,15 @@ class SymPcodeExecutor extends PcodeExecutor<Sym> {
}
String fixupName = callee.getCallFixup();
if (fixupName != null && !"".equals(fixupName)) {
PcodeProgram snippet =
PcodeProgram.fromInject(program, fixupName, InjectPayload.CALLFIXUP_TYPE);
execute(snippet, library);
PcodeProgram snippet;
try {
snippet = PcodeProgram.fromInject(program, fixupName, InjectPayload.CALLFIXUP_TYPE);
execute(snippet, library);
}
catch (MemoryAccessException | UnknownInstructionException | NotFoundException
| IOException e) {
throw new PcodeExecutionException("Issue executing callee fixup: ", e);
}
return;
}
int change = computeStackChange(callee);

14
Ghidra/Debug/ProposedUtils/src/main/java/ghidra/pcode/exec/PcodeProgram.java
View File

@@ -15,6 +15,7 @@
*/
package ghidra.pcode.exec;
import java.io.IOException;
import java.util.*;
import ghidra.app.plugin.processors.sleigh.SleighLanguage;
@@ -25,7 +26,9 @@ import ghidra.pcodeCPort.slghsymbol.UserOpSymbol;
import ghidra.program.model.lang.*;
import ghidra.program.model.listing.Instruction;
import ghidra.program.model.listing.Program;
import ghidra.program.model.mem.MemoryAccessException;
import ghidra.program.model.pcode.PcodeOp;
import ghidra.util.exception.NotFoundException;
/**
* A p-code program to be executed by a {@link PcodeExecutor}
@@ -112,8 +115,7 @@ public class PcodeProgram {
throw new IllegalArgumentException("Instruction must be parsed using Sleigh");
}
PcodeOp[] pcode = instruction.getPcode(includeOverrides);
return new PcodeProgram((SleighLanguage) language, List.of(pcode),
Map.of());
return new PcodeProgram((SleighLanguage) language, List.of(pcode), Map.of());
}
/**
@@ -123,8 +125,14 @@ public class PcodeProgram {
* @param name the name of the snippet
* @param type the type of the snippet
* @return the p-code program
* @throws MemoryAccessException for problems establishing the injection context
* @throws IOException for problems while emitting the injection p-code
* @throws UnknownInstructionException if there is no underlying instruction being injected
* @throws NotFoundException if an expected aspect of the injection is not present in context
*/
public static PcodeProgram fromInject(Program program, String name, int type) {
public static PcodeProgram fromInject(Program program, String name, int type)
throws MemoryAccessException, UnknownInstructionException, NotFoundException,
IOException {
PcodeInjectLibrary library = program.getCompilerSpec().getPcodeInjectLibrary();
InjectContext ctx = library.buildInjectContext();
InjectPayload payload = library.getPayload(type, name);