 @@ -1,14 +1,14 @@
-/*	$NetBSD: kern_fork.c,v 1.198 2017/01/10 00:48:37 kamil Exp $	*/
+/*	$NetBSD: kern_fork.c,v 1.199 2017/01/13 23:00:35 kamil Exp $	*/
 /*-
  * Copyright (c) 1999, 2001, 2004, 2006, 2007, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center, by Charles M. Hannum, and by Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -57,27 +57,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)kern_fork.c	8.8 (Berkeley) 2/14/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_fork.c,v 1.198 2017/01/10 00:48:37 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_fork.c,v 1.199 2017/01/13 23:00:35 kamil Exp $");
 #include "opt_ktrace.h"
 #include "opt_dtrace.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/filedesc.h>
 #include <sys/kernel.h>
 #include <sys/pool.h>
 #include <sys/mount.h>
 #include <sys/proc.h>
 #include <sys/ras.h>
 #include <sys/resourcevar.h>
 @@ -209,27 +209,27 @@ static struct timeval fork_tfmrate = { 1
  */
 int
 fork1(struct lwp *l1, int flags, int exitsig, void *stack, size_t stacksize,
     void (*func)(void *), void *arg, register_t *retval,
     struct proc **rnewprocp)
+{
 	struct proc	*p1, *p2, *parent;
 	struct plimit   *p1_lim;
 	uid_t		uid;
 	struct lwp	*l2;
 	int		count;
 	vaddr_t		uaddr;
 	int		tnprocs;
-	int		tracefork;
+	int		tracefork, tracevforkdone;
 	int		error = 0;
 	p1 = l1->l_proc;
 	uid = kauth_cred_getuid(l1->l_cred);
 	tnprocs = atomic_inc_uint_nv(&nprocs);
 	/*
 	 * Although process entries are dynamically created, we still keep
 	 * a global limit on the maximum number we will create.
 	 */
 	if (__predict_false(tnprocs >= maxproc))
 		error = -1;
 	else
 @@ -461,39 +461,46 @@ fork1(struct lwp *l1, int flags, int exi
 	/*
 	 * It's now safe for the scheduler and other processes to see the
 	 * child process.
 	 */
 	mutex_enter(proc_lock);
 	if (p1->p_session->s_ttyvp != NULL && p1->p_lflag & PL_CONTROLT)
 		p2->p_lflag |= PL_CONTROLT;
 	LIST_INSERT_HEAD(&parent->p_children, p2, p_sibling);
 	p2->p_exitsig = exitsig;		/* signal for parent on exit */
 	/*
-	 * We don't want to tracefork vfork()ed processes because they
+	 * Trace fork(2) and vfork(2)-like events on demand in a debugger.
 	 * will not receive the SIGTRAP until it is too late.
 	 */
 	tracefork = (p1->p_slflag & (PSL_TRACEFORK|PSL_TRACED)) ==
 	    (PSL_TRACEFORK|PSL_TRACED) && (flags && FORK_PPWAIT) == 0;
 	tracevforkdone = (p1->p_slflag & (PSL_TRACEVFORK_DONE|PSL_TRACED)) ==
 	    (PSL_TRACEVFORK_DONE|PSL_TRACED) && (flags && FORK_PPWAIT);
 	if (tracefork) {
 		proc_changeparent(p2, p1->p_pptr);
 		/*
 		 * Set ptrace status.
 		 */
 		p1->p_fpid = p2->p_pid;
 		p2->p_fpid = p1->p_pid;
+	}
 	if (tracevforkdone) {
 		/*
 		 * Set ptrace status.
 		 */
 		p1->p_vfpid_done = p2->p_pid;
+	}
 	LIST_INSERT_AFTER(p1, p2, p_pglist);
 	LIST_INSERT_HEAD(&allproc, p2, p_list);
 	p2->p_trace_enabled = trace_is_enabled(p2);
 #ifdef __HAVE_SYSCALL_INTERN
 	(*p2->p_emul->e_syscall_intern)(p2);
 #endif
 	/*
 	 * Update stats now that we know the fork was successful.
 	 */
 	uvmexp.forks++;
 @@ -566,26 +573,26 @@ fork1(struct lwp *l1, int flags, int exi
+	}
 	mutex_exit(p2->p_lock);
 	/*
 	 * Preserve synchronization semantics of vfork.  If waiting for
 	 * child to exec or exit, sleep until it clears LP_VFORKWAIT.
 	 */
 	while (p2->p_lflag & PL_PPWAIT)
 		cv_wait(&p1->p_waitcv, proc_lock);
 	/*
 	 * Let the parent know that we are tracing its child.
 	 */
-	if (tracefork) {
+	if (tracefork || tracevforkdone) {
 		ksiginfo_t ksi;
 		KSI_INIT_EMPTY(&ksi);
 		ksi.ksi_signo = SIGTRAP;
 		ksi.ksi_code = TRAP_CHLD;
 		ksi.ksi_lid = l1->l_lid;
 		kpsignal(p1, &ksi, NULL);
+	}
 	mutex_exit(proc_lock);
 	return 0;
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: sys_ptrace_common.c,v 1.8 2017/01/06 22:53:17 kamil Exp $	*/
+/*	$NetBSD: sys_ptrace_common.c,v 1.9 2017/01/13 23:00:35 kamil Exp $	*/
 /*-
  * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -108,27 +108,27 @@
 /*
  * References:
  *	(1) Bach's "The Design of the UNIX Operating System",
  *	(2) sys/miscfs/procfs from UCB's 4.4BSD-Lite distribution,
  *	(3) the "4.4BSD Programmer's Reference Manual" published
  *		by USENIX and O'Reilly & Associates.
  * The 4.4BSD PRM does a reasonably good job of documenting what the various
  * ptrace() requests should actually do, and its text is quoted several times
  * in this file.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sys_ptrace_common.c,v 1.8 2017/01/06 22:53:17 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_ptrace_common.c,v 1.9 2017/01/13 23:00:35 kamil Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_ptrace.h"
 #include "opt_ktrace.h"
 #include "opt_pax.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/errno.h>
 #include <sys/exec.h>
 #include <sys/pax.h>
 @@ -780,26 +780,28 @@ do_ptrace(struct ptrace_methods *ptm, st
 			CLR(t->p_slflag, PSL_TRACED|PSL_FSTRACE|PSL_SYSCALL);
 			/* give process back to original parent or init */
 			if (t->p_opptr != t->p_pptr) {
 				struct proc *pp = t->p_opptr;
 				proc_reparent(t, pp ? pp : initproc);
+			}
 			/* not being traced any more */
 			t->p_opptr = NULL;
+		}
 	sendsig:
 		t->p_fpid = 0;
 		t->p_vfpid = 0;
 		t->p_vfpid_done = 0;
 		/* Finally, deliver the requested signal (or none). */
 		if (t->p_stat == SSTOP) {
 			/*
 			 * Unstop the process.  If it needs to take a
 			 * signal, make all efforts to ensure that at
 			 * an LWP runs to see it.
 			 */
 			t->p_xsig = signo;
 			if (resume_all)
 				proc_unstop(t);
 			else
 				lwp_unstop(lt);
 		} else if (t->p_sigctx.ps_faked) {
 @@ -845,55 +847,80 @@ do_ptrace(struct ptrace_methods *ptm, st
 		signo = SIGSTOP;
 		goto sendsig;
 	case  PT_GET_EVENT_MASK:
 		if (data != sizeof(pe)) {
 			DPRINTF(("ptrace(%d): %d != %zu\n", req,
 			    data, sizeof(pe)));
 			error = EINVAL;
 			break;
+		}
 		memset(&pe, 0, sizeof(pe));
 		pe.pe_set_event = ISSET(t->p_slflag, PSL_TRACEFORK) ?
 		    PTRACE_FORK : 0;
 		pe.pe_set_event |= ISSET(t->p_slflag, PSL_TRACEVFORK) ?
 		    PTRACE_VFORK : 0;
 		pe.pe_set_event |= ISSET(t->p_slflag, PSL_TRACEVFORK_DONE) ?
 		    PTRACE_VFORK_DONE : 0;
 		error = copyout(&pe, addr, sizeof(pe));
 		break;
 	case  PT_SET_EVENT_MASK:
 		if (data != sizeof(pe)) {
 			DPRINTF(("ptrace(%d): %d != %zu\n", req, data,
 			    sizeof(pe)));
 			error = EINVAL;
 			break;
+		}
 		if ((error = copyin(addr, &pe, sizeof(pe))) != 0)
 			return error;
 		if (pe.pe_set_event & PTRACE_FORK)
 			SET(t->p_slflag, PSL_TRACEFORK);
 		else
 			CLR(t->p_slflag, PSL_TRACEFORK);
 #if notyet
 		if (pe.pe_set_event & PTRACE_VFORK)
 			SET(t->p_slflag, PSL_TRACEVFORK);
 		else
 			CLR(t->p_slflag, PSL_TRACEVFORK);
 #else
 		if (pe.pe_set_event & PTRACE_VFORK) {
 			error = ENOTSUP;
 			break;
+		}
 #endif
 		if (pe.pe_set_event & PTRACE_VFORK_DONE)
 			SET(t->p_slflag, PSL_TRACEVFORK_DONE);
 		else
 			CLR(t->p_slflag, PSL_TRACEVFORK_DONE);
 		break;
 	case  PT_GET_PROCESS_STATE:
 		if (data != sizeof(ps)) {
 			DPRINTF(("ptrace(%d): %d != %zu\n", req, data,
 			    sizeof(ps)));
 			error = EINVAL;
 			break;
+		}
 		memset(&ps, 0, sizeof(ps));
 		if (t->p_fpid) {
 			ps.pe_report_event = PTRACE_FORK;
 			ps.pe_other_pid = t->p_fpid;
 		} else if (t->p_vfpid) {
 			ps.pe_report_event = PTRACE_VFORK;
 			ps.pe_other_pid = t->p_vfpid;
 		} else if (t->p_vfpid_done) {
 			ps.pe_report_event = PTRACE_VFORK_DONE;
 			ps.pe_other_pid = t->p_vfpid_done;
+		}
 		error = copyout(&ps, addr, sizeof(ps));
 		break;
 	case PT_LWPINFO:
 		if (data != sizeof(pl)) {
 			DPRINTF(("ptrace(%d): %d != %zu\n", req, data,
 			    sizeof(pl)));
 			error = EINVAL;
 			break;
+		}
 		error = copyin(addr, &pl, sizeof(pl));
 		if (error)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: proc.h,v 1.335 2016/10/19 09:44:01 skrll Exp $	*/
+/*	$NetBSD: proc.h,v 1.336 2017/01/13 23:00:35 kamil Exp $	*/
 /*-
  * Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -300,26 +300,28 @@ struct proc {
 	void		*p_tracep;	/* k: Trace private data */
 	struct vnode 	*p_textvp;	/* :: Vnode of executable */
 	struct emul	*p_emul;	/* :: emulation information */
 	void		*p_emuldata;	/* :: per-proc emul data, or NULL */
 	const struct execsw *p_execsw;	/* :: exec package information */
 	struct klist	p_klist;	/* p: knotes attached to proc */
 	LIST_HEAD(, lwp) p_sigwaiters;	/* p: LWPs waiting for signals */
 	sigpend_t	p_sigpend;	/* p: pending signals */
 	struct lcproc	*p_lwpctl;	/* p, a: _lwp_ctl() information */
 	pid_t		p_ppid;		/* :: cached parent pid */
 	pid_t 		p_fpid;		/* :: forked pid */
 	pid_t 		p_vfpid;	/* :: vforked pid */
 	pid_t 		p_vfpid_done;	/* :: vforked done pid */
 	u_int		p_nsems;	/* Count of semaphores */
 /*
  * End area that is zeroed on creation
  */
 #define	p_endzero	p_startcopy
 /*
  * The following fields are all copied upon creation in fork.
  */
 #define	p_startcopy	p_sigctx
 	struct sigctx 	p_sigctx;	/* p: Shared signal state */
 @@ -388,26 +390,29 @@ struct proc {
 #define	PS_STOPFORK	0x00800000 /* Child will be stopped on fork(2) */
 #define	PS_STOPEXEC	0x01000000 /* Will be stopped on exec(2) */
 #define	PS_STOPEXIT	0x02000000 /* Will be stopped at process exit */
 #define	PS_NOTIFYSTOP	0x10000000 /* Notify parent of successful STOP */
 #define	PS_COREDUMP	0x20000000 /* Process core-dumped */
 #define	PS_CONTINUED	0x40000000 /* Process is continued */
 #define	PS_STOPPING	0x80000000 /* Transitioning SACTIVE -> SSTOP */
 /*
  * These flags are kept in p_slflag and are protected by the proc_lock
  * and p_lock.  Access from process context only.
  */
 #define	PSL_TRACEFORK	0x00000001 /* traced process wants fork events */
 #define	PSL_TRACEVFORK	0x00000002 /* traced process wants vfork events */
 #define	PSL_TRACEVFORK_DONE	\
 x00000004 /* traced process wants vfork done events */
 #define	PSL_TRACED	0x00000800 /* Debugged process being traced */
 #define	PSL_FSTRACE	0x00010000 /* Debugger process being traced by procfs */
 #define	PSL_CHTRACED	0x00400000 /* Child has been traced & reparented */
 #define	PSL_SYSCALL	0x04000000 /* process has PT_SYSCALL enabled */
 #define	PSL_SYSCALLEMU	0x08000000 /* cancel in-progress syscall */
 /*
  * Kept in p_stflag and protected by p_stmutex.
  */
 #define	PST_PROFIL	0x00000020 /* Has started profiling */
 /*
  * Kept in p_lflag and protected by the proc_lock.  Access

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ptrace.h,v 1.52 2017/01/06 22:53:17 kamil Exp $	*/
+/*	$NetBSD: ptrace.h,v 1.53 2017/01/13 23:00:35 kamil Exp $	*/
 /*-
  * Copyright (c) 1984, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -83,27 +83,29 @@
 /* 20 */    "PT_GET_SIGINFO",
 /* PT_{G,S}EVENT_MASK */
 typedef struct ptrace_event {
 	int	pe_set_event;
 } ptrace_event_t;
 /* PT_GET_PROCESS_STATE */
 typedef struct ptrace_state {
 	int	pe_report_event;
 	pid_t	pe_other_pid;
 } ptrace_state_t;
-#define	PTRACE_FORK	0x0001	/* Report forks */
+#define	PTRACE_FORK		0x0001	/* Report forks */
 #define	PTRACE_VFORK		0x0002	/* Report vforks */
 #define	PTRACE_VFORK_DONE	0x0004	/* Report parent resumed from vforks */
 /*
  * Argument structure for PT_IO.
  */
 struct ptrace_io_desc {
 	int	piod_op;	/* I/O operation (see below) */
 	void	*piod_offs;	/* child offset */
 	void	*piod_addr;	/* parent offset */
 	size_t	piod_len;	/* request length (in)/actual count (out) */
 };
 /* piod_op */
 #define	PIOD_READ_D	1	/* read from D space */