Module Name: src
Committed By: kamil
Date: Tue Apr 14 22:42:18 UTC 2020
Modified Files:
src/sys/kern: kern_exec.c kern_fork.c
Log Message:
Set p_oppid always, not just when a parent is traced
PR kern/55151 by Martin Husemann
To generate a diff of this commit:
cvs rdiff -u -r1.495 -r1.496 src/sys/kern/kern_exec.c
cvs rdiff -u -r1.221 -r1.222 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_exec.c
diff -u src/sys/kern/kern_exec.c:1.495 src/sys/kern/kern_exec.c:1.496
--- src/sys/kern/kern_exec.c:1.495 Mon Apr 6 08:20:05 2020
+++ src/sys/kern/kern_exec.c Tue Apr 14 22:42:18 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_exec.c,v 1.495 2020/04/06 08:20:05 kamil Exp $ */
+/* $NetBSD: kern_exec.c,v 1.496 2020/04/14 22:42:18 kamil Exp $ */
/*-
* Copyright (c) 2008, 2019, 2020 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.495 2020/04/06 08:20:05 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.496 2020/04/14 22:42:18 kamil Exp $");
#include "opt_exec.h"
#include "opt_execfmt.h"
@@ -2658,10 +2658,10 @@ do_posix_spawn(struct lwp *l1, pid_t *pi
p2->p_exitsig = SIGCHLD; /* signal for parent on exit */
if ((p1->p_slflag & (PSL_TRACEPOSIX_SPAWN|PSL_TRACED)) ==
- (PSL_TRACEPOSIX_SPAWN|PSL_TRACED)) {
+ (PSL_TRACEPOSIX_SPAWN|PSL_TRACED))
proc_changeparent(p2, p1->p_pptr);
- p2->p_oppid = p1->p_pid;
- }
+
+ p2->p_oppid = p1->p_pid; /* Remember the original parent id. */
LIST_INSERT_AFTER(p1, p2, p_pglist);
LIST_INSERT_HEAD(&allproc, p2, p_list);
Index: src/sys/kern/kern_fork.c
diff -u src/sys/kern/kern_fork.c:1.221 src/sys/kern/kern_fork.c:1.222
--- src/sys/kern/kern_fork.c:1.221 Mon Apr 6 08:20:05 2020
+++ src/sys/kern/kern_fork.c Tue Apr 14 22:42:18 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_fork.c,v 1.221 2020/04/06 08:20:05 kamil Exp $ */
+/* $NetBSD: kern_fork.c,v 1.222 2020/04/14 22:42:18 kamil Exp $ */
/*-
* Copyright (c) 1999, 2001, 2004, 2006, 2007, 2008, 2019
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_fork.c,v 1.221 2020/04/06 08:20:05 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_fork.c,v 1.222 2020/04/14 22:42:18 kamil Exp $");
#include "opt_ktrace.h"
#include "opt_dtrace.h"
@@ -511,10 +511,10 @@ fork1(struct lwp *l1, int flags, int exi
/*
* Trace fork(2) and vfork(2)-like events on demand in a debugger.
*/
- if (tracefork(p1, flags) || tracevfork(p1, flags)) {
+ if (tracefork(p1, flags) || tracevfork(p1, flags))
proc_changeparent(p2, p1->p_pptr);
- p2->p_oppid = p1->p_pid;
- }
+
+ p2->p_oppid = p1->p_pid; /* Remember the original parent id. */
LIST_INSERT_AFTER(p1, p2, p_pglist);
LIST_INSERT_HEAD(&allproc, p2, p_list);
