4 files changed, 29 insertions, 11 deletions

diff --git a/sys/miscfs/devfs/devfs_vnops.c b/sys/miscfs/devfs/devfs_vnops.c
index 64387e6bd29f..b924ef5de4fc 100644
--- a/sys/miscfs/devfs/devfs_vnops.c
+++ b/sys/miscfs/devfs/devfs_vnops.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- *	$Id: devfs_vnops.c,v 1.70 1999/02/25 16:06:51 bde Exp $
+ *	$Id: devfs_vnops.c,v 1.71 1999/04/27 11:16:31 phk Exp $
  */
 
 
@@ -381,7 +381,7 @@ found:
 	 * but only use suser_xxx prives as a last resort
 	 * (Use of super powers is recorded in ap->a_p->p_acflag)
 	 */
-	if( suser_xxx(cred, &ap->a_p->p_acflag) == 0) /* XXX what if no proc? */
+	if( suser_xxx(cred, ap->a_p, 0) == 0) /* XXX what if no proc? */
 		return 0;
 	return (EACCES);
 }
@@ -519,7 +519,7 @@ DBPRINT(("setattr\n"));
 #endif
 		if (((vap->va_vaflags & VA_UTIMES_NULL) == 0) &&
 		    (cred->cr_uid != file_node->uid)  &&
-		    suser_xxx(cred, &p->p_acflag))
+		    suser_xxx(cred, p, 0))
 			return (EPERM);
 		    if(VOP_ACCESS(vp, VWRITE, cred, p))
 			return (EACCES);
@@ -534,7 +534,7 @@ DBPRINT(("setattr\n"));
 	 */
 	if (vap->va_mode != (u_short)VNOVAL) {
 		if ((cred->cr_uid != file_node->uid)
-		 && suser_xxx(cred, &p->p_acflag))
+		 && suser_xxx(cred, p, 0))
 			return (EPERM);
 		/* set drwxwxrwx stuff */
 		file_node->mode &= ~07777;
@@ -545,7 +545,7 @@ DBPRINT(("setattr\n"));
 	 * Change the owner.. must be root to do this.
 	 */
 	if (vap->va_uid != (uid_t)VNOVAL) {
-		if (suser_xxx(cred, &p->p_acflag))
+		if (suser_xxx(cred, p, 0))
 			return (EPERM);
 		file_node->uid = vap->va_uid;
 	}
@@ -568,7 +568,7 @@ DBPRINT(("setattr\n"));
 		 * we can't do it with normal privs,
 		 * do we have an ace up our sleeve?
 		 */
-	 	if( suser_xxx(cred, &p->p_acflag))
+	 	if( suser_xxx(cred, p, 0))
 			return (EPERM);
 cando:
 		file_node->gid = vap->va_gid;
@@ -580,7 +580,7 @@ cando:
 	 * flags should be handled some day
 	 */
 	if (vap->va_flags != VNOVAL) {
-		if (error = suser_xxx(cred, &p->p_acflag))
+		if (error = suser_xxx(cred, p, 0))
 			return error;
 		if (cred->cr_uid == 0)
 		;
diff --git a/sys/miscfs/procfs/procfs.h b/sys/miscfs/procfs/procfs.h
index 180a47f5ad8b..d9b333bda765 100644
--- a/sys/miscfs/procfs/procfs.h
+++ b/sys/miscfs/procfs/procfs.h
@@ -37,7 +37,7 @@
  *	@(#)procfs.h	8.9 (Berkeley) 5/14/95
  *
  * From:
- *	$Id: procfs.h,v 1.21 1999/01/05 03:53:06 peter Exp $
+ *	$Id: procfs.h,v 1.22 1999/04/27 11:16:35 phk Exp $
  */
 
 /*
@@ -92,7 +92,8 @@ struct pfsnode {
  * Evaluates to 1 if access is allowed.
  */
 #define CHECKIO(p1, p2) \
-     ((((p1)->p_cred->pc_ucred->cr_uid == (p2)->p_cred->p_ruid) && \
+     (PRISON_CHECK(p1, p2) && \
+       (((p1)->p_cred->pc_ucred->cr_uid == (p2)->p_cred->p_ruid) && \
        ((p1)->p_cred->p_ruid == (p2)->p_cred->p_ruid) && \
        ((p1)->p_cred->p_svuid == (p2)->p_cred->p_ruid) && \
        ((p2)->p_flag & P_SUGID) == 0) || (suser((p1)) == 0))
diff --git a/sys/miscfs/procfs/procfs_status.c b/sys/miscfs/procfs/procfs_status.c
index 3176a6440064..ba1abe42be04 100644
--- a/sys/miscfs/procfs/procfs_status.c
+++ b/sys/miscfs/procfs/procfs_status.c
@@ -37,12 +37,13 @@
  *	@(#)procfs_status.c	8.4 (Berkeley) 6/15/94
  *
  * From:
- *	$Id: procfs_status.c,v 1.11 1998/07/11 07:45:45 bde Exp $
+ *	$Id: procfs_status.c,v 1.12 1999/01/05 03:53:06 peter Exp $
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
+#include <sys/jail.h>
 #include <sys/vnode.h>
 #include <sys/tty.h>
 #include <sys/resourcevar.h>
@@ -134,6 +135,11 @@ procfs_dostatus(curp, p, pfs, uio)
 
 	for (i = 0; i < cr->cr_ngroups; i++)
 		ps += sprintf(ps, ",%lu", (u_long)cr->cr_groups[i]);
+
+	if (p->p_prison)
+		ps += sprintf(ps, " %s", p->p_prison->pr_host);
+	else
+		ps += sprintf(ps, " -");
 	ps += sprintf(ps, "\n");
 
 	xlen = ps - psbuf;
diff --git a/sys/miscfs/procfs/procfs_vnops.c b/sys/miscfs/procfs/procfs_vnops.c
index ffab3e8a02fa..4f0b8fefb107 100644
--- a/sys/miscfs/procfs/procfs_vnops.c
+++ b/sys/miscfs/procfs/procfs_vnops.c
@@ -36,7 +36,7 @@
  *
  *	@(#)procfs_vnops.c	8.18 (Berkeley) 5/21/95
  *
- *	$Id: procfs_vnops.c,v 1.64 1999/01/27 22:42:07 dillon Exp $
+ *	$Id: procfs_vnops.c,v 1.65 1999/04/27 11:16:39 phk Exp $
  */
 
 /*
@@ -134,6 +134,8 @@ procfs_open(ap)
 	p2 = PFIND(pfs->pfs_pid);
 	if (p2 == NULL)
 		return (ENOENT);
+	if (!PRISON_CHECK(ap->a_p, p2))
+		return (ENOENT);
 
 	switch (pfs->pfs_type) {
 	case Pmem:
@@ -835,6 +837,8 @@ procfs_readdir(ap)
 		p = PFIND(pfs->pfs_pid);
 		if (p == NULL)
 			break;
+		if (!PRISON_CHECK(curproc, p))
+			break;
 
 		for (pt = &proc_targets[i];
 		     uio->uio_resid >= UIO_MX && i < nproc_targets; pt++, i++) {
@@ -893,7 +897,14 @@ procfs_readdir(ap)
 
 			default:
 				while (pcnt < i) {
+					p = p->p_list.le_next;
+					if (!p)
+						goto done;
+					if (!PRISON_CHECK(curproc, p))
+						continue;
 					pcnt++;
+				}
+				while (!PRISON_CHECK(curproc, p)) {
 					p = p->p_list.le_next;
 					if (!p)
 						goto done;