Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-1-6]: src/sys/kern Pull up revision 1.58 (requested by itojun in ...
details: https://anonhg.NetBSD.org/src/rev/149d840522ba
branches: netbsd-1-6
changeset: 528321:149d840522ba
user: lukem <lukem%NetBSD.org@localhost>
date: Sun Jun 30 23:44:49 2002 +0000
description:
Pull up revision 1.58 (requested by itojun in ticket #398):
disallow ktrace on P_SUGID. from openbsd
diffstat:
sys/kern/kern_ktrace.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diffs (28 lines):
diff -r f5d1638b9160 -r 149d840522ba sys/kern/kern_ktrace.c
--- a/sys/kern/kern_ktrace.c Sun Jun 30 12:55:49 2002 +0000
+++ b/sys/kern/kern_ktrace.c Sun Jun 30 23:44:49 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_ktrace.c,v 1.55 2001/11/12 15:25:10 lukem Exp $ */
+/* $NetBSD: kern_ktrace.c,v 1.55.10.1 2002/06/30 23:44:49 lukem Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_ktrace.c,v 1.55 2001/11/12 15:25:10 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_ktrace.c,v 1.55.10.1 2002/06/30 23:44:49 lukem Exp $");
#include "opt_ktrace.h"
@@ -651,7 +651,8 @@
target->p_ruid == target->p_svuid &&
caller->p_rgid == target->p_rgid && /* XXX */
target->p_rgid == target->p_svgid &&
- (targetp->p_traceflag & KTRFAC_ROOT) == 0) ||
+ (targetp->p_traceflag & KTRFAC_ROOT) == 0 &&
+ (targetp->p_flag & P_SUGID) == 0) ||
caller->pc_ucred->cr_uid == 0)
return (1);
Home |
Main Index |
Thread Index |
Old Index