D32367.id96470.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D32367.id96470.diff
View Options

	Index: sys/amd64/linux/linux_ptrace.c
	===================================================================
	--- sys/amd64/linux/linux_ptrace.c
	+++ sys/amd64/linux/linux_ptrace.c
	@@ -71,6 +71,7 @@
	#define LINUX_PTRACE_SEIZE 0x4206
	#define LINUX_PTRACE_GET_SYSCALL_INFO 0x420e

	+#define LINUX_PTRACE_EVENT_EXEC 4
	#define LINUX_PTRACE_EVENT_EXIT 6

	#define LINUX_PTRACE_O_TRACESYSGOOD 1
	@@ -146,6 +147,8 @@
	if ((pem->ptrace_flags & LINUX_PTRACE_O_TRACESYSGOOD) &&
	lwpinfo.pl_flags & PL_FLAG_SCX)
	status \|= (LINUX_SIGTRAP \| 0x80) << 8;
	+ if (lwpinfo.pl_flags & PL_FLAG_EXEC)
	+ status \|= (LINUX_SIGTRAP \| LINUX_PTRACE_EVENT_EXEC << 8) << 8;
	if ((pem->ptrace_flags & LINUX_PTRACE_O_TRACEEXIT) &&
	lwpinfo.pl_flags & PL_FLAG_EXITED)
	status \|= (LINUX_SIGTRAP \| LINUX_PTRACE_EVENT_EXIT << 8) << 8;
	Index: sys/kern/subr_syscall.c
	===================================================================
	--- sys/kern/subr_syscall.c
	+++ sys/kern/subr_syscall.c
	@@ -266,6 +266,14 @@
	((td->td_dbgflags & (TDB_FORK \| TDB_EXEC)) != 0 \|\|
	(p->p_ptevents & PTRACE_SCX) != 0))
	ptracestop(td, SIGTRAP, NULL);
	+ /*
	+ * Linux debuggers expect an additional stop for exec.
	+ */
	+ if ((td->td_dbgflags & TDB_EXEC) != 0 &&
	+ SV_PROC_ABI(td->td_proc) == SV_ABI_LINUX) {
	+ td->td_dbgflags &= ~TDB_EXEC;
	+ ptracestop(td, SIGTRAP, NULL);
	+ }
	td->td_dbgflags &= ~(TDB_SCX \| TDB_EXEC \| TDB_FORK);
	PROC_UNLOCK(p);
	}