Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-05-23 06:36:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

GP-5818: Fix TracePropertyMapSpace for object mode. Fix TaintEmu tests.

Browse Source
This commit is contained in:
Dan
2025-07-21 15:50:46 +00:00
parent f71ad662d1
commit ea6b8b0a67
3 changed files with 35 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/model/property/TracePropertyMapSpace.java
+15 -1
View File
@@ -69,6 +69,20 @@ public interface TracePropertyMapSpace<T> extends TracePropertyMapOperations<T>
set(getTrace().getPlatformManager().getHostPlatform(), lifespan, register, value);
}
/**
* Get all entries intersecting the given register and lifespan
*
* @param platform the platform defining the register
* @param lifespan the range of snaps
* @param register the register
* @return the entries
*/
default Collection<Map.Entry<TraceAddressSnapRange, T>> getEntries(TracePlatform platform,
Lifespan lifespan, Register register) {
AddressRange range = platform.getConventionalRegisterRange(getAddressSpace(), register);
return getEntries(lifespan, range);
}
/**
* Get all entries intersecting the given register and lifespan
*
@@ -78,7 +92,7 @@ public interface TracePropertyMapSpace<T> extends TracePropertyMapOperations<T>
*/
default Collection<Map.Entry<TraceAddressSnapRange, T>> getEntries(Lifespan lifespan,
Register register) {
return getEntries(lifespan, TraceRegisterUtils.rangeForRegister(register));
return getEntries(getTrace().getPlatformManager().getHostPlatform(), lifespan, register);
}
/**
Ghidra/Debug/TaintAnalysis/src/test/java/ghidra/pcode/emu/taint/full/TaintDebuggerPcodeEmulatorTest.java
+18 -18
View File
@@ -15,7 +15,8 @@
*/
package ghidra.pcode.emu.taint.full;
import static org.junit.Assert.*;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import java.util.Set;
@@ -34,7 +35,6 @@ import ghidra.app.services.DebuggerStaticMappingService;
import ghidra.debug.api.emulation.DebuggerPcodeMachine;
import ghidra.pcode.emu.taint.trace.TaintTracePcodeEmulatorTest;
import ghidra.pcode.emu.taint.trace.TaintTracePcodeExecutorStatePiece;
import ghidra.program.model.address.AddressSpace;
import ghidra.program.model.util.StringPropertyMap;
import ghidra.program.util.ProgramLocation;
import ghidra.trace.database.ToyDBTraceBuilder.ToySchemaBuilder;
@@ -65,15 +65,24 @@ public class TaintDebuggerPcodeEmulatorTest extends AbstractGhidraHeadedDebugger
.count());
}
protected SchemaContext buildContext() {
return new ToySchemaBuilder()
.noRegisterGroups()
.useRegistersPerFrame()
.build();
}
@Test
public void testFactoryCreate() throws Exception {
emuService.setEmulatorFactory(new TaintDebuggerPcodeEmulatorFactory());
createAndOpenTrace();
TraceThread thread;
try (Transaction tx = tb.startTransaction()) {
tb.createRootObject(buildContext(), "Target");
tb.getOrAddThread("Threads[0]", 0);
thread = tb.getOrAddThread("Threads[0]", 0);
tb.createObjectsFramesAndRegs(thread, Lifespan.nowOn(0), tb.host, 1);
}
traceManager.activateTrace(tb.trace);
@@ -86,7 +95,7 @@ public class TaintDebuggerPcodeEmulatorTest extends AbstractGhidraHeadedDebugger
public TickStep nextSlice(Trace trace) {
// Expect decode of uninitialized memory immediately
assertEquals(0, calls++);
return new TickStep(1, 1);
return new TickStep(thread.getKey(), 1);
}
});
@@ -94,7 +103,7 @@ public class TaintDebuggerPcodeEmulatorTest extends AbstractGhidraHeadedDebugger
assertTrue(emu instanceof TaintDebuggerPcodeEmulator);
}
//@Test
@Test
public void testReadsProgramUsrProperties() throws Exception {
emuService.setEmulatorFactory(new TaintDebuggerPcodeEmulatorFactory());
@@ -106,13 +115,12 @@ public class TaintDebuggerPcodeEmulatorTest extends AbstractGhidraHeadedDebugger
programManager.openProgram(program);
AddressSpace rs = tb.language.getAddressFactory().getRegisterSpace();
TraceThread thread;
try (Transaction tx = tb.startTransaction()) {
tb.createRootObject(buildContext(), "Target");
mappingService.addMapping(
new DefaultTraceLocation(tb.trace, null, Lifespan.nowOn(0), tb.addr(0x55550000)),
new ProgramLocation(program, tb.addr(0x00400000)), 0x1000, false);
tb.createRootObject(buildContext(), "Target");
thread = tb.getOrAddThread("Threads[0]", 0);
tb.createObjectsFramesAndRegs(thread, Lifespan.nowOn(0), tb.host, 1);
tb.exec(0, thread, 0, "RIP = 0x55550000;");
@@ -135,24 +143,16 @@ public class TaintDebuggerPcodeEmulatorTest extends AbstractGhidraHeadedDebugger
asm.assemble(tb.addr(0x00400000), "MOV RAX, qword ptr [0x00400800]");
}
TraceSchedule time = TraceSchedule.parse("0:t1-1");
TraceSchedule time = TraceSchedule.parse("0:t%d-1".formatted(thread.getKey()));
long scratch = emuService.emulate(tb.trace, time, TaskMonitor.DUMMY);
TracePropertyMap<String> traceTaintMap = tb.trace.getAddressPropertyManager()
.getPropertyMap(TaintTracePcodeExecutorStatePiece.NAME, String.class);
TracePropertyMapSpace<String> taintRegSpace =
traceTaintMap.getPropertyMapRegisterSpace(thread, 0, true);
traceTaintMap.getPropertyMapRegisterSpace(thread, 0, false);
assertEquals(TaintTracePcodeEmulatorTest.makeTaintEntries(tb.trace,
Lifespan.span(scratch, -1), rs, Set.of(0L), "test_0"),
Lifespan.span(scratch, -1), taintRegSpace.getAddressSpace(), Set.of(0L), "test_0"),
Set.copyOf(taintRegSpace.getEntries(Lifespan.at(scratch), tb.reg("RAX"))));
}
SchemaContext buildContext() {
return new ToySchemaBuilder()
.noRegisterGroups()
.useRegistersPerFrame()
.build();
}
}
Ghidra/Debug/TaintAnalysis/src/test/java/ghidra/pcode/emu/taint/trace/TaintTracePcodeEmulatorTest.java
+2 -2
View File
@@ -154,7 +154,6 @@ public class TaintTracePcodeEmulatorTest extends AbstractTracePcodeEmulatorTest
@Test
public void testWriteStateRegister() throws Throwable {
try (ToyDBTraceBuilder tb = new ToyDBTraceBuilder("Test", "x86:LE:64:default")) {
AddressSpace rs = tb.language.getAddressFactory().getRegisterSpace();
TraceThread thread = initTrace(tb, "", List.of());
TaintTracePcodeEmulator emu = new TaintTracePcodeEmulator(tb.host, 0);
@@ -176,7 +175,8 @@ public class TaintTracePcodeEmulatorTest extends AbstractTracePcodeEmulatorTest
// TODO: Might be nice to coalesce identical values
// Becomes the 2D cover optimization problem. Still could do some easy cases.
assertEquals(
makeTaintEntries(tb.trace, Lifespan.nowOn(1), rs, Set.of(0L, 1L, 2L, 3L), "test_0"),
makeTaintEntries(tb.trace, Lifespan.nowOn(1), mapSpace.getAddressSpace(),
Set.of(0L, 1L, 2L, 3L), "test_0"),
Set.copyOf(mapSpace.getEntries(Lifespan.at(1), tb.reg("RAX"))));
}
}