From owner-p4-projects Sat Nov 16 20:31: 9 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8E83E37B404; Sat, 16 Nov 2002 20:31:06 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2694D37B401 for ; Sat, 16 Nov 2002 20:31:06 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D253A43E3B for ; Sat, 16 Nov 2002 20:31:05 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAH4SKmV024274 for ; Sat, 16 Nov 2002 20:28:20 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAH4SJ6v024269 for perforce@freebsd.org; Sat, 16 Nov 2002 20:28:19 -0800 (PST) Date: Sat, 16 Nov 2002 20:28:19 -0800 (PST) Message-Id: <200211170428.gAH4SJ6v024269@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 21131 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21131 Change 21131 by rwatson@rwatson_paprika on 2002/11/16 20:27:56 Key kld enforcemnt off of mac_enforce_kld rather than mac_enforce_system. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#365 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#365 (text+ko) ==== @@ -125,6 +125,11 @@ &mac_enforce_fs, 0, "Enforce MAC policy on file system objects"); TUNABLE_INT("security.mac.enforce_fs", &mac_enforce_fs); +static int mac_enforce_kld = 1; +SYSCTL_INT(_security_mac, OID_AUTO, enforce_kld, CTLFLAG_RW, + &mac_enforce_kld, 0, "Enforce MAC policy on kld operations"); +TUNABLE_INT("security.mac.enforce_kld", &mac_enforce_kld); + static int mac_enforce_network = 1; SYSCTL_INT(_security_mac, OID_AUTO, enforce_network, CTLFLAG_RW, &mac_enforce_network, 0, "Enforce MAC policy on network packets"); @@ -2323,7 +2328,7 @@ ASSERT_VOP_LOCKED(vp, "mac_check_kld_load"); - if (!mac_enforce_system) + if (!mac_enforce_kld) return (0); MAC_CHECK(check_kld_load, cred, vp, &vp->v_label); @@ -2336,7 +2341,7 @@ { int error; - if (!mac_enforce_system) + if (!mac_enforce_kld) return (0); MAC_CHECK(check_kld_stat, cred); @@ -2349,7 +2354,7 @@ { int error; - if (!mac_enforce_system) + if (!mac_enforce_kld) return (0); MAC_CHECK(check_kld_unload, cred); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message