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/netbsd32 Pull up revision 1.3 (requested by ...
details: https://anonhg.NetBSD.org/src/rev/54387e6758ed
branches: netbsd-1-6
changeset: 528643:54387e6758ed
user: lukem <lukem%NetBSD.org@localhost>
date: Mon Jul 29 15:39:18 2002 +0000
description:
Pull up revision 1.3 (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/netbsd32/netbsd32_wait.c | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diffs (33 lines):
diff -r 27dc22cfa816 -r 54387e6758ed sys/compat/netbsd32/netbsd32_wait.c
--- a/sys/compat/netbsd32/netbsd32_wait.c Mon Jul 29 15:39:08 2002 +0000
+++ b/sys/compat/netbsd32/netbsd32_wait.c Mon Jul 29 15:39:18 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_wait.c,v 1.2 2001/11/13 02:09:10 lukem Exp $ */
+/* $NetBSD: netbsd32_wait.c,v 1.2.10.1 2002/07/29 15:39:18 lukem Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_wait.c,v 1.2 2001/11/13 02:09:10 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_wait.c,v 1.2.10.1 2002/07/29 15:39:18 lukem Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -102,11 +102,10 @@
* parent a SIGCHLD. The rest of the cleanup will be
* done when the old parent waits on the child.
*/
- if ((p->p_flag & P_TRACED) &&
- p->p_oppid != p->p_pptr->p_pid) {
- t = pfind(p->p_oppid);
+ if ((p->p_flag & P_TRACED) && p->p_opptr != p->p_pptr){
+ t = p->p_opptr;
proc_reparent(p, t ? t : initproc);
- p->p_oppid = 0;
+ p->p_opptr = NULL;
p->p_flag &= ~(P_TRACED|P_WAITED|P_FSTRACE);
psignal(p->p_pptr, SIGCHLD);
wakeup((caddr_t)p->p_pptr);
Home |
Main Index |
Thread Index |
Old Index