Module Name: src
Committed By: kamil
Date: Fri Apr 5 21:41:18 UTC 2019
Modified Files:
src/sys/kern: kern_fork.c
Log Message:
Correct distinguishing fork/vfork tracing event in fork1(9)
flags can contain a different value than FORK_PPWAIT and bit comparing
with '&&' was a typo.
Detected with __clone(2) usage scenarios.
To generate a diff of this commit:
cvs rdiff -u -r1.206 -r1.207 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.206 src/sys/kern/kern_fork.c:1.207
--- src/sys/kern/kern_fork.c:1.206 Wed Apr 3 08:08:00 2019
+++ src/sys/kern/kern_fork.c Fri Apr 5 21:41:18 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_fork.c,v 1.206 2019/04/03 08:08:00 kamil Exp $ */
+/* $NetBSD: kern_fork.c,v 1.207 2019/04/05 21:41:18 kamil 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.206 2019/04/03 08:08:00 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_fork.c,v 1.207 2019/04/05 21:41:18 kamil Exp $");
#include "opt_ktrace.h"
#include "opt_dtrace.h"
@@ -477,11 +477,11 @@ fork1(struct lwp *l1, int flags, int exi
* Trace fork(2) and vfork(2)-like events on demand in a debugger.
*/
tracefork = (p1->p_slflag & (PSL_TRACEFORK|PSL_TRACED)) ==
- (PSL_TRACEFORK|PSL_TRACED) && (flags && FORK_PPWAIT) == 0;
+ (PSL_TRACEFORK|PSL_TRACED) && (flags & FORK_PPWAIT) == 0;
tracevfork = (p1->p_slflag & (PSL_TRACEVFORK|PSL_TRACED)) ==
- (PSL_TRACEVFORK|PSL_TRACED) && (flags && FORK_PPWAIT) != 0;
+ (PSL_TRACEVFORK|PSL_TRACED) && (flags & FORK_PPWAIT) != 0;
tracevforkdone = (p1->p_slflag & (PSL_TRACEVFORK_DONE|PSL_TRACED)) ==
- (PSL_TRACEVFORK_DONE|PSL_TRACED) && (flags && FORK_PPWAIT);
+ (PSL_TRACEVFORK_DONE|PSL_TRACED) && (flags & FORK_PPWAIT);
if (tracefork || tracevfork)
proc_changeparent(p2, p1->p_pptr);
if (tracefork) {
