Module Name: src
Committed By: christos
Date: Sat Nov 12 19:42:47 UTC 2016
Modified Files:
src/sys/kern: kern_prot.c
Log Message:
PR/51624: Return the original parent for a traced process.
To generate a diff of this commit:
cvs rdiff -u -r1.119 -r1.120 src/sys/kern/kern_prot.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_prot.c
diff -u src/sys/kern/kern_prot.c:1.119 src/sys/kern/kern_prot.c:1.120
--- src/sys/kern/kern_prot.c:1.119 Mon Aug 24 18:50:32 2015
+++ src/sys/kern/kern_prot.c Sat Nov 12 14:42:47 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_prot.c,v 1.119 2015/08/24 22:50:32 pooka Exp $ */
+/* $NetBSD: kern_prot.c,v 1.120 2016/11/12 19:42:47 christos Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1990, 1991, 1993
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_prot.c,v 1.119 2015/08/24 22:50:32 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_prot.c,v 1.120 2016/11/12 19:42:47 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_43.h"
@@ -80,6 +80,21 @@ sys_getpid(struct lwp *l, const void *v,
return (0);
}
+static pid_t
+kern_getppid(struct lwp *l)
+{
+ struct proc *p = l->l_proc;
+ pid_t ppid;
+
+ mutex_enter(proc_lock);
+ mutex_enter(p->p_lock);
+ ppid = (p->p_slflag & PSL_TRACED) && p->p_opptr ? p->p_opptr->p_pid :
+ p->p_pptr->p_pid;
+ mutex_exit(p->p_lock);
+ mutex_exit(proc_lock);
+ return ppid;
+}
+
/* ARGSUSED */
int
sys_getpid_with_ppid(struct lwp *l, const void *v, register_t *retval)
@@ -87,7 +102,7 @@ sys_getpid_with_ppid(struct lwp *l, cons
struct proc *p = l->l_proc;
retval[0] = p->p_pid;
- retval[1] = p->p_ppid;
+ retval[1] = kern_getppid(l);
return (0);
}
@@ -95,9 +110,7 @@ sys_getpid_with_ppid(struct lwp *l, cons
int
sys_getppid(struct lwp *l, const void *v, register_t *retval)
{
- struct proc *p = l->l_proc;
-
- *retval = p->p_ppid;
+ *retval = kern_getppid(l);
return (0);
}
