From 0620bd26eaf9842b4a73da897cf793b66f0cfc6e Mon Sep 17 00:00:00 2001 From: Michael Neumann Date: Sun, 12 Jul 2009 23:46:10 +0200 Subject: [PATCH] priv: Use PRIV_DEBUG_UNPRIV in procfs --- sys/kern/kern_jail.c | 4 ++++ sys/vfs/procfs/procfs.h | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/sys/kern/kern_jail.c b/sys/kern/kern_jail.c index 3b0db0ec45..26960945b8 100644 --- a/sys/kern/kern_jail.c +++ b/sys/kern/kern_jail.c @@ -708,6 +708,10 @@ prison_priv_check(struct ucred *cred, int priv) return (0); + case PRIV_DEBUG_UNPRIV: + return (0); + + /* * Allow jailed root to bind reserved ports. */ diff --git a/sys/vfs/procfs/procfs.h b/sys/vfs/procfs/procfs.h index 66027000d1..e9de6d899a 100644 --- a/sys/vfs/procfs/procfs.h +++ b/sys/vfs/procfs/procfs.h @@ -94,12 +94,13 @@ struct pfsnode { ((type) + 2) : \ ((((pid)+1) << 4) + ((int) (type)))) +/* XXX: Is PRIV_DEBUG_UNPRIV correct? */ #define CHECKIO(p1, p2) \ ((((p1)->p_ucred->cr_uid == (p2)->p_ucred->cr_ruid) && \ ((p1)->p_ucred->cr_ruid == (p2)->p_ucred->cr_ruid) && \ ((p1)->p_ucred->cr_svuid == (p2)->p_ucred->cr_ruid) && \ ((p2)->p_flag & (P_SUGID|P_INEXEC)) == 0) || \ - (priv_check_cred((p1)->p_ucred, PRIV_ROOT, PRISON_ROOT) == 0)) + (priv_check_cred((p1)->p_ucred, PRIV_DEBUG_UNPRIV, 0) == 0)) /* * Convert between pfsnode vnode -- 2.41.0