Module Name: src
Committed By: christos
Date: Thu Feb 2 02:44:07 UTC 2012
Modified Files:
src/sys/kern: kern_fork.c
Log Message:
Disable PTRACE_FORK for vforked() children, because the parent is waiting
and will not receive the SIGTRAP in time.
To generate a diff of this commit:
cvs rdiff -u -r1.186 -r1.187 src/sys/kern/kern_fork.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/kern_fork.c
diff -u src/sys/kern/kern_fork.c:1.186 src/sys/kern/kern_fork.c:1.187
--- src/sys/kern/kern_fork.c:1.186 Fri Sep 2 16:06:29 2011
+++ src/sys/kern/kern_fork.c Wed Feb 1 21:44:06 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_fork.c,v 1.186 2011/09/02 20:06:29 christos Exp $ */
+/* $NetBSD: kern_fork.c,v 1.187 2012/02/02 02:44:06 christos Exp $ */
/*-
* Copyright (c) 1999, 2001, 2004, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_fork.c,v 1.186 2011/09/02 20:06:29 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_fork.c,v 1.187 2012/02/02 02:44:06 christos Exp $");
#include "opt_ktrace.h"
@@ -460,8 +460,12 @@ fork1(struct lwp *l1, int flags, int exi
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
+ * will not receive the SIGTRAP until it is too late.
+ */
tracefork = (p1->p_slflag & (PSL_TRACEFORK|PSL_TRACED)) ==
- (PSL_TRACEFORK|PSL_TRACED);
+ (PSL_TRACEFORK|PSL_TRACED) && (flags && FORK_PPWAIT) == 0;
if (tracefork) {
p2->p_slflag |= PSL_TRACED;
p2->p_opptr = p2->p_pptr;
