Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-1-6]: src/sys/compat/svr4_32 Pull up revision 1.13 (requested by ...
details: https://anonhg.NetBSD.org/src/rev/6aebe6869119
branches: netbsd-1-6
changeset: 528644:6aebe6869119
user: lukem <lukem%NetBSD.org@localhost>
date: Mon Jul 29 15:39:29 2002 +0000
description:
Pull up revision 1.13 (requested by jdolocek in ticket #557):
Convert to use p_opptr rather than p_oppid. Part of fix for
security/14444 by David Sainty.
diffstat:
sys/compat/svr4_32/svr4_32_misc.c | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diffs (33 lines):
diff -r 54387e6758ed -r 6aebe6869119 sys/compat/svr4_32/svr4_32_misc.c
--- a/sys/compat/svr4_32/svr4_32_misc.c Mon Jul 29 15:39:18 2002 +0000
+++ b/sys/compat/svr4_32/svr4_32_misc.c Mon Jul 29 15:39:29 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: svr4_32_misc.c,v 1.12 2002/03/31 22:22:49 christos Exp $ */
+/* $NetBSD: svr4_32_misc.c,v 1.12.4.1 2002/07/29 15:39:29 lukem Exp $ */
/*-
* Copyright (c) 1994 The NetBSD Foundation, Inc.
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: svr4_32_misc.c,v 1.12 2002/03/31 22:22:49 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svr4_32_misc.c,v 1.12.4.1 2002/07/29 15:39:29 lukem Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1260,11 +1260,10 @@
* parent a SIGCHLD. The rest of the cleanup will be
* done when the old parent waits on the child.
*/
- if ((q->p_flag & P_TRACED) &&
- q->p_oppid != q->p_pptr->p_pid) {
- t = pfind(q->p_oppid);
+ if ((q->p_flag & P_TRACED) && q->p_opptr != q->p_pptr){
+ t = q->p_opptr;
proc_reparent(q, t ? t : initproc);
- q->p_oppid = 0;
+ q->p_opptr = NULL;
q->p_flag &= ~(P_TRACED|P_WAITED|P_FSTRACE);
psignal(q->p_pptr, SIGCHLD);
wakeup((caddr_t)q->p_pptr);
Home |
Main Index |
Thread Index |
Old Index