Skip to content

Ghidra is a software reverse engineering (SRE) framework

GP-6442 Fixing spurious references in called functions the are branched to and discovered to be called during constant propagation

emteered368e935856e
diff --git a/Ghidra/Features/Base/src/main/java/ghidra/program/util/SymbolicPropogator.java b/Ghidra/Features/Base/src/main/java/ghidra/program/util/SymbolicPropogator.java
index 301d84edbb..d27f62df13 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/program/util/SymbolicPropogator.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/program/util/SymbolicPropogator.java
@@ -484,6 +484,9 @@ public class SymbolicPropogator {
throws CancelledException {
visitedBody = new AddressSet();
AddressSet conflicts = new AddressSet();
+
+ // Locations that were jump and are now call targets and might be on saved future flows
+ HashSet<Address> doNotFlowTo = new HashSet<>();
// prime the context stack with the entry point address
Stack<SavedFlowState> contextStack = new Stack<>();
@@ -536,6 +539,11 @@ public class SymbolicPropogator {
}
}
}
+
+ // don't follow flow if on list of jump targets that were turned into calls
+ if (doNotFlowTo.contains(nextAddr)) {
+ continue;
+ }
HashSet<Address> visitSet = visitedMap.get(nextAddr);
if (visitSet != null) {
@@ -636,6 +644,9 @@ public class SymbolicPropogator {
Address targets[] = getInstructionFlows(instr);
for (Address target : targets) {
handleFunctionSideEffects(instr, target, monitor);
+ // a jump target has already been pushed as a future flow trace
+ // need to make sure values aren't propagated into the call targets
+ doNotFlowTo.add(target);
}
}