Index: kern/kern_sysctl.c
===================================================================
RCS file: /private/FreeBSD/src/sys/kern/kern_sysctl.c,v
retrieving revision 1.148
diff -u -p -r1.148 kern_sysctl.c
--- kern/kern_sysctl.c	5 Oct 2003 13:31:33 -0000	1.148
+++ kern/kern_sysctl.c	16 Feb 2004 17:28:03 -0000
@@ -1175,12 +1175,21 @@ sysctl_root(SYSCTL_HANDLER_ARGS)
 	if (!oid->oid_handler)
 		return EINVAL;
 
-	if ((oid->oid_kind & CTLTYPE) == CTLTYPE_NODE)
-		error = oid->oid_handler(oid, (int *)arg1 + indx, arg2 - indx,
-		    req);
-	else
-		error = oid->oid_handler(oid, oid->oid_arg1, oid->oid_arg2,
-		    req);
+	if ((oid->oid_kind & CTLTYPE) == CTLTYPE_NODE) {
+		(int *)arg1 += indx;
+		arg2 -= indx;
+	} else {
+		arg1 = oid->oid_arg1;
+		arg2 = oid->oid_arg2;
+	}
+#ifdef MAC
+	error = mac_check_system_sysctl(req->td->td_ucred, oid, arg1, arg2,
+	    req);
+	if (error != 0)
+		return (error);
+#endif
+	error = oid->oid_handler(oid, arg1, arg2, req);
+
 	return (error);
 }
 
@@ -1271,15 +1280,6 @@ userland_sysctl(struct thread *td, int *
 	req.lock = REQ_LOCKED;
 
 	SYSCTL_LOCK();
-
-#ifdef MAC
-	error = mac_check_system_sysctl(td->td_ucred, name, namelen, old,
-	    oldlenp, inkernel, new, newlen);
-	if (error) {
-		SYSCTL_UNLOCK();
-		return (error);
-	}
-#endif
 
 	do {
 	    req2 = req;
Index: security/mac/mac_system.c
===================================================================
RCS file: /private/FreeBSD/src/sys/security/mac/mac_system.c,v
retrieving revision 1.102
diff -u -p -r1.102 mac_system.c
--- security/mac/mac_system.c	12 Nov 2003 03:14:30 -0000	1.102
+++ security/mac/mac_system.c	16 Feb 2004 17:28:55 -0000
@@ -249,8 +249,8 @@ mac_check_system_swapoff(struct ucred *c
 }
 
 int
-mac_check_system_sysctl(struct ucred *cred, int *name, u_int namelen,
-    void *old, size_t *oldlenp, int inkernel, void *new, size_t newlen)
+mac_check_system_sysctl(struct ucred *cred, struct sysctl_oid *oidp, void *arg1,
+    int arg2, struct sysctl_req *req)
 {
 	int error;
 
@@ -261,8 +261,7 @@ mac_check_system_sysctl(struct ucred *cr
 	if (!mac_enforce_system)
 		return (0);
 
-	MAC_CHECK(check_system_sysctl, cred, name, namelen, old, oldlenp,
-	    inkernel, new, newlen);
+	MAC_CHECK(check_system_sysctl, cred, oidp, arg1, arg2, req);
 
 	return (error);
 }
Index: security/mac_biba/mac_biba.c
===================================================================
RCS file: /private/FreeBSD/src/sys/security/mac_biba/mac_biba.c,v
retrieving revision 1.74
diff -u -p -r1.74 mac_biba.c
--- security/mac_biba/mac_biba.c	1 Feb 2004 05:56:50 -0000	1.74
+++ security/mac_biba/mac_biba.c	16 Feb 2004 17:11:28 -0000
@@ -1973,8 +1973,8 @@ mac_biba_check_system_swapoff(struct ucr
 }
 
 static int
-mac_biba_check_system_sysctl(struct ucred *cred, int *name, u_int namelen,
-    void *old, size_t *oldlenp, int inkernel, void *new, size_t newlen)
+mac_biba_check_system_sysctl(struct ucred *cred, struct sysctl_oid *oidp,
+    void *arg1, int arg2, struct sysctl_req *req)
 {
 	struct mac_biba *subj;
 	int error;
@@ -1985,16 +1985,10 @@ mac_biba_check_system_sysctl(struct ucre
 	subj = SLOT(cred->cr_label);
 
 	/*
-	 * In general, treat sysctl variables as biba/high, but also
-	 * require privilege to change them, since they are a
-	 * communications channel between grades.  Exempt MIB
-	 * queries from this due to undocmented sysctl magic.
-	 * XXXMAC: This probably requires some more review.
+	 * Treat sysctl variables without CTLFLAG_ANYBODY flag as
+	 * biba/high, but also require privilege to change them.
 	 */
-	if (new != NULL) {
-		if (namelen > 0 && name[0] == 0)
-			return (0);
-
+	if (req->newptr != NULL && (oidp->oid_kind & CTLFLAG_ANYBODY) == 0) {
 		if (!mac_biba_subject_dominate_high(subj))
 			return (EACCES);
 
Index: security/mac_lomac/mac_lomac.c
===================================================================
RCS file: /private/FreeBSD/src/sys/security/mac_lomac/mac_lomac.c,v
retrieving revision 1.27
diff -u -p -r1.27 mac_lomac.c
--- security/mac_lomac/mac_lomac.c	1 Feb 2004 05:56:51 -0000	1.27
+++ security/mac_lomac/mac_lomac.c	16 Feb 2004 17:11:40 -0000
@@ -2063,8 +2063,8 @@ mac_lomac_check_system_swapon(struct ucr
 }
 
 static int
-mac_lomac_check_system_sysctl(struct ucred *cred, int *name, u_int namelen,
-    void *old, size_t *oldlenp, int inkernel, void *new, size_t newlen)
+mac_lomac_check_system_sysctl(struct ucred *cred, struct sysctl_oid *oidp,
+    void *arg1, int arg2, struct sysctl_req *req)
 {
 	struct mac_lomac *subj;
 
@@ -2074,16 +2074,10 @@ mac_lomac_check_system_sysctl(struct ucr
 	subj = SLOT(cred->cr_label);
 
 	/*
-	 * In general, treat sysctl variables as lomac/high, but also
-	 * require privilege to change them, since they are a
-	 * communications channel between grades.  Exempt MIB
-	 * queries from this due to undocmented sysctl magic.
-	 * XXXMAC: This probably requires some more review.
+	 * Treat sysctl variables without CTLFLAG_ANYBODY flag as
+	 * lomac/high, but also require privilege to change them.
 	 */
-	if (new != NULL) {
-		if (namelen > 0 && name[0] == 0)
-			return (0);
-
+	if (req->newptr != NULL && (oidp->oid_kind & CTLFLAG_ANYBODY) == 0) {
 #ifdef notdef
 		if (!mac_lomac_subject_dominate_high(subj))
 			return (EACCES);
Index: security/mac_stub/mac_stub.c
===================================================================
RCS file: /private/FreeBSD/src/sys/security/mac_stub/mac_stub.c,v
retrieving revision 1.38
diff -u -p -r1.38 mac_stub.c
--- security/mac_stub/mac_stub.c	1 Feb 2004 21:52:09 -0000	1.38
+++ security/mac_stub/mac_stub.c	16 Feb 2004 10:12:14 -0000
@@ -757,8 +757,8 @@ stub_check_system_swapoff(struct ucred *
 }
 
 static int
-stub_check_system_sysctl(struct ucred *cred, int *name, u_int namelen,
-    void *old, size_t *oldlenp, int inkernel, void *new, size_t newlen)
+stub_check_system_sysctl(struct ucred *cred, struct sysctl_oid *oidp,
+    void *arg1, int arg2, struct sysctl_req *req)
 {
 
 	return (0);
Index: security/mac_test/mac_test.c
===================================================================
RCS file: /private/FreeBSD/src/sys/security/mac_test/mac_test.c,v
retrieving revision 1.41
diff -u -p -r1.41 mac_test.c
--- security/mac_test/mac_test.c	1 Feb 2004 05:56:51 -0000	1.41
+++ security/mac_test/mac_test.c	16 Feb 2004 10:12:41 -0000
@@ -1470,8 +1470,8 @@ mac_test_check_system_swapoff(struct ucr
 }
 
 static int
-mac_test_check_system_sysctl(struct ucred *cred, int *name, u_int namelen,
-    void *old, size_t *oldlenp, int inkernel, void *new, size_t newlen)
+mac_test_check_system_sysctl(struct ucred *cred, struct sysctl_oid *oidp,
+    void *arg1, int arg2, struct sysctl_req *req)
 {
 
 	ASSERT_CRED_LABEL(cred->cr_label);
Index: sys/mac.h
===================================================================
RCS file: /private/FreeBSD/src/sys/sys/mac.h,v
retrieving revision 1.54
diff -u -p -r1.54 mac.h
--- sys/mac.h	1 Feb 2004 05:56:51 -0000	1.54
+++ sys/mac.h	16 Feb 2004 18:19:49 -0000
@@ -120,6 +120,8 @@ struct mount;
 struct proc;
 struct sockaddr;
 struct socket;
+struct sysctl_oid;
+struct sysctl_req;
 struct pipepair;
 struct thread;
 struct timespec;
@@ -281,9 +283,8 @@ int	mac_check_system_reboot(struct ucred
 int	mac_check_system_settime(struct ucred *cred);
 int	mac_check_system_swapon(struct ucred *cred, struct vnode *vp);
 int	mac_check_system_swapoff(struct ucred *cred, struct vnode *vp);
-int	mac_check_system_sysctl(struct ucred *cred, int *name,
-	    u_int namelen, void *old, size_t *oldlenp, int inkernel,
-	    void *new, size_t newlen);
+int	mac_check_system_sysctl(struct ucred *cred, struct sysctl_oid *oidp,
+	    void *arg1, int arg2, struct sysctl_req *req);
 int	mac_check_vnode_access(struct ucred *cred, struct vnode *vp,
 	    int acc_mode);
 int	mac_check_vnode_chdir(struct ucred *cred, struct vnode *dvp);
Index: sys/mac_policy.h
===================================================================
RCS file: /private/FreeBSD/src/sys/sys/mac_policy.h,v
retrieving revision 1.48
diff -u -p -r1.48 mac_policy.h
--- sys/mac_policy.h	1 Feb 2004 05:56:51 -0000	1.48
+++ sys/mac_policy.h	16 Feb 2004 17:28:29 -0000
@@ -63,6 +63,8 @@ struct mount;
 struct pipepair;
 struct sbuf;
 struct socket;
+struct sysctl_oid;
+struct sysctl_req;
 struct ucred;
 struct uio;
 struct vnode;
@@ -362,9 +364,9 @@ struct mac_policy_ops {
 		    struct vnode *vp, struct label *label);
 	int	(*mpo_check_system_swapoff)(struct ucred *cred,
 		    struct vnode *vp, struct label *label);
-	int	(*mpo_check_system_sysctl)(struct ucred *cred, int *name,
-		    u_int namelen, void *old, size_t *oldlenp, int inkernel,
-		    void *new, size_t newlen);
+	int	(*mpo_check_system_sysctl)(struct ucred *cred,
+		    struct sysctl_oid *oidp, void *arg1, int arg2,
+		    struct sysctl_req *req);
 	int	(*mpo_check_vnode_access)(struct ucred *cred,
 		    struct vnode *vp, struct label *label, int acc_mode);
 	int	(*mpo_check_vnode_chdir)(struct ucred *cred,