 @@ -1,14 +1,14 @@
-/*	$NetBSD: procfs_vfsops.c,v 1.83 2009/03/15 17:22:38 cegger Exp $	*/
+/*	$NetBSD: procfs_vfsops.c,v 1.84 2009/10/02 23:00:02 elad Exp $	*/
 /*
  * Copyright (c) 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Jan-Simon Pendry.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -66,27 +66,27 @@
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)procfs_vfsops.c	8.7 (Berkeley) 5/10/95
  */
 /*
  * procfs VFS interface
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: procfs_vfsops.c,v 1.83 2009/03/15 17:22:38 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: procfs_vfsops.c,v 1.84 2009/10/02 23:00:02 elad Exp $");
 #if defined(_KERNEL_OPT)
 #include "opt_compat_netbsd.h"
 #endif
 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/sysctl.h>
 #include <sys/proc.h>
 #include <sys/buf.h>
 #include <sys/syslog.h>
 @@ -100,26 +100,28 @@ __KERNEL_RCSID(0, "$NetBSD: procfs_vfsop
 #include <miscfs/genfs/genfs.h>
 #include <miscfs/procfs/procfs.h>
 #include <uvm/uvm_extern.h>			/* for PAGE_SIZE */
 MODULE(MODULE_CLASS_VFS, procfs, NULL);
 VFS_PROTOS(procfs);
 static struct sysctllog *procfs_sysctl_log;
 static kauth_listener_t procfs_listener;
 /*
  * VFS Operations.
+ *
  * mount system call
  */
 /* ARGSUSED */
 int
 procfs_mount(
     struct mount *mp,
     const char *path,
     void *data,
     size_t *data_len)
+{
 @@ -295,52 +297,96 @@ struct vfsops procfs_vfsops = {
 	NULL,				/* vfs_mountroot */
 	(int (*)(struct mount *, struct vnode *, struct timespec *)) eopnotsupp,
 	vfs_stdextattrctl,
 	(void *)eopnotsupp,		/* vfs_suspendctl */
 	genfs_renamelock_enter,
 	genfs_renamelock_exit,
 	(void *)eopnotsupp,
 	procfs_vnodeopv_descs,
 ,
 	{ NULL, NULL },
 };
 static int
 procfs_listener_cb(kauth_cred_t cred, kauth_action_t action, void *cookie,
     void *arg0, void *arg1, void *arg2, void *arg3)
+{
 	struct proc *p;
 	struct pfsnode *pfs;
 	enum kauth_process_req req;
 	int result;
 	result = KAUTH_RESULT_DEFER;
 	p = arg0;
 	pfs = arg1;
 	req = (enum kauth_process_req)(unsigned long)arg2;
 	if (action != KAUTH_PROCESS_PROCFS)
 		return result;
 	/* Privileged; let secmodel handle that. */
 	if (req == KAUTH_REQ_PROCESS_PROCFS_CTL)
 		return result;
 	switch (pfs->pfs_type) {
 	case PFSregs:
 	case PFSfpregs:
 	case PFSmem:
 		if (kauth_cred_getuid(cred) != kauth_cred_getuid(p->p_cred) ||
 		    ISSET(p->p_flag, PK_SUGID))
 			break;
 		/*FALLTHROUGH*/
 	default:
 		result = KAUTH_RESULT_ALLOW;
 		break;
+	}
 	return result;
+}
 static int
 procfs_modcmd(modcmd_t cmd, void *arg)
+{
 	int error;
 	switch (cmd) {
 	case MODULE_CMD_INIT:
 		error = vfs_attach(&procfs_vfsops);
 		if (error != 0)
 			break;
 		sysctl_createv(&procfs_sysctl_log, 0, NULL, NULL,
 			       CTLFLAG_PERMANENT,
 			       CTLTYPE_NODE, "vfs", NULL,
 			       NULL, 0, NULL, 0,
 			       CTL_VFS, CTL_EOL);
 		sysctl_createv(&procfs_sysctl_log, 0, NULL, NULL,
 			       CTLFLAG_PERMANENT,
 			       CTLTYPE_NODE, "procfs",
 			       SYSCTL_DESCR("Process file system"),
 			       NULL, 0, NULL, 0,
 			       CTL_VFS, 12, CTL_EOL);
 		/*
 		 * XXX the "12" above could be dynamic, thereby eliminating
 		 * one more instance of the "number to vfs" mapping problem,
 		 * but "12" is the order as taken from sys/mount.h
 		 */
 		procfs_listener = kauth_listen_scope(KAUTH_SCOPE_PROCESS,
 		    procfs_listener_cb, NULL);
 		break;
 	case MODULE_CMD_FINI:
 		error = vfs_detach(&procfs_vfsops);
 		if (error != 0)
 			break;
 		sysctl_teardown(&procfs_sysctl_log);
 		kauth_unlisten_scope(procfs_listener);
 		break;
 	default:
 		error = ENOTTY;
 		break;
+	}
 	return (error);
+}

 @@ -1,14 +1,14 @@
-/* $NetBSD: secmodel_suser.c,v 1.7 2009/10/02 22:46:18 elad Exp $ */
+/* $NetBSD: secmodel_suser.c,v 1.8 2009/10/02 23:00:02 elad Exp $ */
 /*-
  * Copyright (c) 2006 Elad Efrat <elad@NetBSD.org>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. The name of the author may not be used to endorse or promote products
 @@ -28,27 +28,27 @@
 /*
  * This file contains kauth(9) listeners needed to implement the traditional
  * NetBSD superuser access restrictions.
+ *
  * There are two main resources a request can be issued to: user-owned and
  * system owned. For the first, traditional Unix access checks are done, as
  * well as superuser checks. If needed, the request context is examined before
  * a decision is made. For the latter, usually only superuser checks are done
  * as normal users are not allowed to access system resources.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: secmodel_suser.c,v 1.7 2009/10/02 22:46:18 elad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: secmodel_suser.c,v 1.8 2009/10/02 23:00:02 elad Exp $");
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/kauth.h>
 #include <sys/acct.h>
 #include <sys/mutex.h>
 #include <sys/ktrace.h>
 #include <sys/mount.h>
 #include <sys/pset.h>
 #include <sys/socketvar.h>
 #include <sys/sysctl.h>
 #include <sys/tty.h>
 @@ -564,56 +564,31 @@ secmodel_suser_process_cb(kauth_cred_t c
 		default:
 			break;
+		}
 		break;
+		}
 	case KAUTH_PROCESS_KTRACE:
 		if (isroot)
 			result = KAUTH_RESULT_ALLOW;
 		break;
-	case KAUTH_PROCESS_PROCFS: {
+	case KAUTH_PROCESS_PROCFS:
-		enum kauth_process_req req = (enum kauth_process_req)arg2;
+		if (isroot)
 		struct pfsnode *pfs = arg1;
 		if (isroot) {
 			result = KAUTH_RESULT_ALLOW;
 			break;
 		if (req == KAUTH_REQ_PROCESS_PROCFS_CTL) {
 			break;
 		switch (pfs->pfs_type) {
 		case PFSregs:
 		case PFSfpregs:
 		case PFSmem:
 			if (kauth_cred_getuid(cred) !=
 			    kauth_cred_getuid(p->p_cred) ||
 			    ISSET(p->p_flag, PK_SUGID)) {
 				break;
 			/*FALLTHROUGH*/
 		default:
 			result = KAUTH_RESULT_ALLOW;
 			break;
 		break;
 	case KAUTH_PROCESS_PTRACE:
 		if (isroot)
 			result = KAUTH_RESULT_ALLOW;
 		break;
 	case KAUTH_PROCESS_CORENAME:
 		if (isroot || proc_uidmatch(cred, p->p_cred) == 0)
 			result = KAUTH_RESULT_ALLOW;
 		break;