diff options
Diffstat (limited to 'src/agent/sud.zig')
| -rw-r--r-- | src/agent/sud.zig | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/agent/sud.zig b/src/agent/sud.zig index 5d2c6ad..41d7cb6 100644 --- a/src/agent/sud.zig +++ b/src/agent/sud.zig @@ -11,6 +11,14 @@ //! always lets through: a signal that interrupts it runs the target's handler //! as the target's code, its syscalls seen like any other. //! +//! The kernel starts a handler with default rights to memory behind +//! protection keys and default floating-point modes, the thread's own put +//! away in the frame. The handler takes the thread's first (`signal.adopt`): +//! otherwise a buffer in protected memory is EFAULT to the syscall, a +//! pkey_alloc's new rights are undone by the handler's return, and a thread +//! cloned here is born without its maker's rights (V8's compiler threads +//! then fault reading the code space). +//! //! The handler runs on an alternate stack of the agent's, one a thread: the //! target's stack may have no room for a signal frame (a thread made with a //! few kilobytes), and a vfork child takes its parent's stack over. @@ -67,6 +75,9 @@ pub fn arm() void { fn onSyscall(_: i32, _: *const linux.siginfo_t, uc: *signal.Ucontext) callconv(.c) void { selector = allow; + // The syscall is the thread's: made with its rights to protected memory, + // and a thread it starts gets its floating-point modes, not a handler's. + signal.adopt(uc); const number = uc.rax; var a = [6]u64{ uc.rdi, uc.rsi, uc.rdx, uc.r10, uc.r8, uc.r9 }; if (number == nr(.rt_sigreturn)) { @@ -113,6 +124,7 @@ fn onSyscall(_: i32, _: *const linux.siginfo_t, uc: *signal.Ucontext) callconv(. if (result == 0 and (number == nr(.fork) or number == nr(.clone) or number == nr(.clone3))) agent.forked(); agent.emit(.syscall_exit, @truncate(number), .{ result, 0, 0, 0, 0, 0 }, ""); uc.rax = result; + signal.keys.keep(uc); selector = block; } |
