Skip to content

Commit c145f2f

Browse files
committed
Handle case where si_signo==SIGTRAP and si_code==SIGTRAP
It would be nice if we had a better way to disambiguate these ptrace-derived siginfos from normal signals, but it's not obvious how to do that.
1 parent 1e42eed commit c145f2f

1 file changed

Lines changed: 17 additions & 1 deletion

File tree

‎src/kernel_abi.cc‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,6 +301,7 @@ static void set_arch_siginfo_arch(const siginfo_t& src, void* dest,
301301
u.linux_api = src;
302302
auto& siginfo = u.native_api;
303303

304+
memset(si, 0, sizeof(*si));
304305
si->si_signo = siginfo.si_signo;
305306
si->si_errno = siginfo.si_errno;
306307
si->si_code = siginfo.si_code;
@@ -339,12 +340,27 @@ static void set_arch_siginfo_arch(const siginfo_t& src, void* dest,
339340
case SIGBUS:
340341
case SIGFPE:
341342
case SIGSEGV:
342-
case SIGTRAP:
343343
si->_sifields._sigfault.si_addr_ =
344344
siginfo._sifields._sigfault.si_addr_.rptr();
345345
si->_sifields._sigfault.si_addr_lsb_ =
346346
siginfo._sifields._sigfault.si_addr_lsb_;
347347
break;
348+
case SIGTRAP:
349+
// ptrace stops can have si_signo == SIGTRAP and si_code == SIGTRAP (| 0x80)
350+
// in which case pid/uid are set instead of addr/lsb.
351+
// SIGTRAP == TRAP_UNK and most architectures don't generate TRAP_UNK at all,
352+
// so we should be OK here.
353+
if (siginfo.si_code == SIGTRAP ||
354+
siginfo.si_code == (SIGTRAP | 0x80)) {
355+
si->_sifields._kill.si_pid_ = siginfo._sifields._kill.si_pid_;
356+
si->_sifields._kill.si_uid_ = siginfo._sifields._kill.si_uid_;
357+
} else {
358+
si->_sifields._sigfault.si_addr_ =
359+
siginfo._sifields._sigfault.si_addr_.rptr();
360+
si->_sifields._sigfault.si_addr_lsb_ =
361+
siginfo._sifields._sigfault.si_addr_lsb_;
362+
}
363+
break;
348364
case SIGIO:
349365
si->_sifields._sigpoll.si_band_ = siginfo._sifields._sigpoll.si_band_;
350366
si->_sifields._sigpoll.si_fd_ = siginfo._sifields._sigpoll.si_fd_;

0 commit comments

Comments
 (0)