summaryrefslogtreecommitdiff
path: root/src/trace
diff options
context:
space:
mode:
Diffstat (limited to 'src/trace')
-rw-r--r--src/trace/Debugger.zig5
-rw-r--r--src/trace/debugger_test.zig13
2 files changed, 17 insertions, 1 deletions
diff --git a/src/trace/Debugger.zig b/src/trace/Debugger.zig
index bbdaee6..b0ebcba 100644
--- a/src/trace/Debugger.zig
+++ b/src/trace/Debugger.zig
@@ -450,6 +450,11 @@ fn atSyscall(d: *Debugger, stop: Stop) !bool {
.read, .pread64 => if (@as(i64, @bitCast(d.regs.rax)) > 0) try d.snapshot(d.regs.rsi, @min(d.regs.rax, d.capture)),
else => {},
};
+ if (stop == .syscall_enter) switch (std.enums.fromInt(linux.SYS, stop.syscall_enter) orelse .close) {
+ // What the kernel is given is the target's memory as it is now: whatever was sent of it before may be stale.
+ .write, .pwrite64 => try d.snapshot(d.regs.rsi, @min(d.regs.rdx, d.capture)),
+ else => {},
+ };
if (d.on_syscall) |hook| return try hook.func(hook.ctx, d, stop) == .stop;
return d.syscalls == .stop;
}
diff --git a/src/trace/debugger_test.zig b/src/trace/debugger_test.zig
index bfee1d6..370876a 100644
--- a/src/trace/debugger_test.zig
+++ b/src/trace/debugger_test.zig
@@ -329,12 +329,23 @@ test "the same program under glibc and under musl: the syscalls tell them apart"
try std.testing.expectEqual(@as(usize, 1), glibc.calls(.write));
try std.testing.expectEqual(@as(usize, 0), glibc.calls(.writev));
var opened_libc = false;
+ var buffer: u64 = 0;
for (glibc.events.items) |e| {
if (e.ev.kind != .syscall_enter) continue;
if (e.ev.aux == @backingInt(linux.SYS.openat) and std.mem.endsWith(u8, e.payload, "libc.so.6")) opened_libc = true;
- if (e.ev.aux == @backingInt(linux.SYS.write)) try std.testing.expectEqualStrings("small b\n", e.payload);
+ if (e.ev.aux == @backingInt(linux.SYS.write)) {
+ try std.testing.expectEqualStrings("small b\n", e.payload);
+ buffer = e.ev.a[1];
+ }
}
try std.testing.expect(opened_libc);
+ // What is written is memory too, as it was when the kernel took it.
+ var in_memory = false;
+ for (glibc.events.items) |e| {
+ if (e.ev.kind != .mem_write or e.ev.a[0] > buffer or buffer + 8 > e.ev.a[0] + e.payload.len) continue;
+ in_memory = std.mem.eql(u8, "small b\n", e.payload[buffer - e.ev.a[0] ..][0..8]);
+ }
+ try std.testing.expect(in_memory);
// The library and its mappings are known as they appear.
var mapped_libc = false;
for (glibc.events.items) |e| {