From 3da87a65c7661cbb194f379e2f435e2edb119387 Mon Sep 17 00:00:00 2001 From: Robert Watson Date: Mon, 4 Nov 2002 14:55:14 +0000 Subject: Remove mac_cache_fslabel_in_vnode sysctl -- with the new VFS/MAC construction, labels are always cached. Obtained from: TrustedBSD Project Sponsored by: DARPA, Network Associates Laboratories --- sys/kern/kern_mac.c | 6 ------ sys/security/mac/mac_framework.c | 6 ------ sys/security/mac/mac_internal.h | 6 ------ sys/security/mac/mac_net.c | 6 ------ sys/security/mac/mac_pipe.c | 6 ------ sys/security/mac/mac_process.c | 6 ------ sys/security/mac/mac_syscalls.c | 6 ------ sys/security/mac/mac_system.c | 6 ------ sys/security/mac/mac_vfs.c | 6 ------ 9 files changed, 54 deletions(-) diff --git a/sys/kern/kern_mac.c b/sys/kern/kern_mac.c index ea9bdb3c4c29..d36fbea5096c 100644 --- a/sys/kern/kern_mac.c +++ b/sys/kern/kern_mac.c @@ -153,12 +153,6 @@ SYSCTL_INT(_security_mac, OID_AUTO, enforce_vm, CTLFLAG_RW, &mac_enforce_vm, 0, "Enforce MAC policy on vm operations"); TUNABLE_INT("security.mac.enforce_vm", &mac_enforce_vm); -static int mac_cache_fslabel_in_vnode = 1; -SYSCTL_INT(_security_mac, OID_AUTO, cache_fslabel_in_vnode, CTLFLAG_RW, - &mac_cache_fslabel_in_vnode, 0, "Cache mount fslabel in vnode"); -TUNABLE_INT("security.mac.cache_fslabel_in_vnode", - &mac_cache_fslabel_in_vnode); - static int mac_mmap_revocation = 1; SYSCTL_INT(_security_mac, OID_AUTO, mmap_revocation, CTLFLAG_RW, &mac_mmap_revocation, 0, "Revoke mmap access to files on subject " diff --git a/sys/security/mac/mac_framework.c b/sys/security/mac/mac_framework.c index ea9bdb3c4c29..d36fbea5096c 100644 --- a/sys/security/mac/mac_framework.c +++ b/sys/security/mac/mac_framework.c @@ -153,12 +153,6 @@ SYSCTL_INT(_security_mac, OID_AUTO, enforce_vm, CTLFLAG_RW, &mac_enforce_vm, 0, "Enforce MAC policy on vm operations"); TUNABLE_INT("security.mac.enforce_vm", &mac_enforce_vm); -static int mac_cache_fslabel_in_vnode = 1; -SYSCTL_INT(_security_mac, OID_AUTO, cache_fslabel_in_vnode, CTLFLAG_RW, - &mac_cache_fslabel_in_vnode, 0, "Cache mount fslabel in vnode"); -TUNABLE_INT("security.mac.cache_fslabel_in_vnode", - &mac_cache_fslabel_in_vnode); - static int mac_mmap_revocation = 1; SYSCTL_INT(_security_mac, OID_AUTO, mmap_revocation, CTLFLAG_RW, &mac_mmap_revocation, 0, "Revoke mmap access to files on subject " diff --git a/sys/security/mac/mac_internal.h b/sys/security/mac/mac_internal.h index ea9bdb3c4c29..d36fbea5096c 100644 --- a/sys/security/mac/mac_internal.h +++ b/sys/security/mac/mac_internal.h @@ -153,12 +153,6 @@ SYSCTL_INT(_security_mac, OID_AUTO, enforce_vm, CTLFLAG_RW, &mac_enforce_vm, 0, "Enforce MAC policy on vm operations"); TUNABLE_INT("security.mac.enforce_vm", &mac_enforce_vm); -static int mac_cache_fslabel_in_vnode = 1; -SYSCTL_INT(_security_mac, OID_AUTO, cache_fslabel_in_vnode, CTLFLAG_RW, - &mac_cache_fslabel_in_vnode, 0, "Cache mount fslabel in vnode"); -TUNABLE_INT("security.mac.cache_fslabel_in_vnode", - &mac_cache_fslabel_in_vnode); - static int mac_mmap_revocation = 1; SYSCTL_INT(_security_mac, OID_AUTO, mmap_revocation, CTLFLAG_RW, &mac_mmap_revocation, 0, "Revoke mmap access to files on subject " diff --git a/sys/security/mac/mac_net.c b/sys/security/mac/mac_net.c index ea9bdb3c4c29..d36fbea5096c 100644 --- a/sys/security/mac/mac_net.c +++ b/sys/security/mac/mac_net.c @@ -153,12 +153,6 @@ SYSCTL_INT(_security_mac, OID_AUTO, enforce_vm, CTLFLAG_RW, &mac_enforce_vm, 0, "Enforce MAC policy on vm operations"); TUNABLE_INT("security.mac.enforce_vm", &mac_enforce_vm); -static int mac_cache_fslabel_in_vnode = 1; -SYSCTL_INT(_security_mac, OID_AUTO, cache_fslabel_in_vnode, CTLFLAG_RW, - &mac_cache_fslabel_in_vnode, 0, "Cache mount fslabel in vnode"); -TUNABLE_INT("security.mac.cache_fslabel_in_vnode", - &mac_cache_fslabel_in_vnode); - static int mac_mmap_revocation = 1; SYSCTL_INT(_security_mac, OID_AUTO, mmap_revocation, CTLFLAG_RW, &mac_mmap_revocation, 0, "Revoke mmap access to files on subject " diff --git a/sys/security/mac/mac_pipe.c b/sys/security/mac/mac_pipe.c index ea9bdb3c4c29..d36fbea5096c 100644 --- a/sys/security/mac/mac_pipe.c +++ b/sys/security/mac/mac_pipe.c @@ -153,12 +153,6 @@ SYSCTL_INT(_security_mac, OID_AUTO, enforce_vm, CTLFLAG_RW, &mac_enforce_vm, 0, "Enforce MAC policy on vm operations"); TUNABLE_INT("security.mac.enforce_vm", &mac_enforce_vm); -static int mac_cache_fslabel_in_vnode = 1; -SYSCTL_INT(_security_mac, OID_AUTO, cache_fslabel_in_vnode, CTLFLAG_RW, - &mac_cache_fslabel_in_vnode, 0, "Cache mount fslabel in vnode"); -TUNABLE_INT("security.mac.cache_fslabel_in_vnode", - &mac_cache_fslabel_in_vnode); - static int mac_mmap_revocation = 1; SYSCTL_INT(_security_mac, OID_AUTO, mmap_revocation, CTLFLAG_RW, &mac_mmap_revocation, 0, "Revoke mmap access to files on subject " diff --git a/sys/security/mac/mac_process.c b/sys/security/mac/mac_process.c index ea9bdb3c4c29..d36fbea5096c 100644 --- a/sys/security/mac/mac_process.c +++ b/sys/security/mac/mac_process.c @@ -153,12 +153,6 @@ SYSCTL_INT(_security_mac, OID_AUTO, enforce_vm, CTLFLAG_RW, &mac_enforce_vm, 0, "Enforce MAC policy on vm operations"); TUNABLE_INT("security.mac.enforce_vm", &mac_enforce_vm); -static int mac_cache_fslabel_in_vnode = 1; -SYSCTL_INT(_security_mac, OID_AUTO, cache_fslabel_in_vnode, CTLFLAG_RW, - &mac_cache_fslabel_in_vnode, 0, "Cache mount fslabel in vnode"); -TUNABLE_INT("security.mac.cache_fslabel_in_vnode", - &mac_cache_fslabel_in_vnode); - static int mac_mmap_revocation = 1; SYSCTL_INT(_security_mac, OID_AUTO, mmap_revocation, CTLFLAG_RW, &mac_mmap_revocation, 0, "Revoke mmap access to files on subject " diff --git a/sys/security/mac/mac_syscalls.c b/sys/security/mac/mac_syscalls.c index ea9bdb3c4c29..d36fbea5096c 100644 --- a/sys/security/mac/mac_syscalls.c +++ b/sys/security/mac/mac_syscalls.c @@ -153,12 +153,6 @@ SYSCTL_INT(_security_mac, OID_AUTO, enforce_vm, CTLFLAG_RW, &mac_enforce_vm, 0, "Enforce MAC policy on vm operations"); TUNABLE_INT("security.mac.enforce_vm", &mac_enforce_vm); -static int mac_cache_fslabel_in_vnode = 1; -SYSCTL_INT(_security_mac, OID_AUTO, cache_fslabel_in_vnode, CTLFLAG_RW, - &mac_cache_fslabel_in_vnode, 0, "Cache mount fslabel in vnode"); -TUNABLE_INT("security.mac.cache_fslabel_in_vnode", - &mac_cache_fslabel_in_vnode); - static int mac_mmap_revocation = 1; SYSCTL_INT(_security_mac, OID_AUTO, mmap_revocation, CTLFLAG_RW, &mac_mmap_revocation, 0, "Revoke mmap access to files on subject " diff --git a/sys/security/mac/mac_system.c b/sys/security/mac/mac_system.c index ea9bdb3c4c29..d36fbea5096c 100644 --- a/sys/security/mac/mac_system.c +++ b/sys/security/mac/mac_system.c @@ -153,12 +153,6 @@ SYSCTL_INT(_security_mac, OID_AUTO, enforce_vm, CTLFLAG_RW, &mac_enforce_vm, 0, "Enforce MAC policy on vm operations"); TUNABLE_INT("security.mac.enforce_vm", &mac_enforce_vm); -static int mac_cache_fslabel_in_vnode = 1; -SYSCTL_INT(_security_mac, OID_AUTO, cache_fslabel_in_vnode, CTLFLAG_RW, - &mac_cache_fslabel_in_vnode, 0, "Cache mount fslabel in vnode"); -TUNABLE_INT("security.mac.cache_fslabel_in_vnode", - &mac_cache_fslabel_in_vnode); - static int mac_mmap_revocation = 1; SYSCTL_INT(_security_mac, OID_AUTO, mmap_revocation, CTLFLAG_RW, &mac_mmap_revocation, 0, "Revoke mmap access to files on subject " diff --git a/sys/security/mac/mac_vfs.c b/sys/security/mac/mac_vfs.c index ea9bdb3c4c29..d36fbea5096c 100644 --- a/sys/security/mac/mac_vfs.c +++ b/sys/security/mac/mac_vfs.c @@ -153,12 +153,6 @@ SYSCTL_INT(_security_mac, OID_AUTO, enforce_vm, CTLFLAG_RW, &mac_enforce_vm, 0, "Enforce MAC policy on vm operations"); TUNABLE_INT("security.mac.enforce_vm", &mac_enforce_vm); -static int mac_cache_fslabel_in_vnode = 1; -SYSCTL_INT(_security_mac, OID_AUTO, cache_fslabel_in_vnode, CTLFLAG_RW, - &mac_cache_fslabel_in_vnode, 0, "Cache mount fslabel in vnode"); -TUNABLE_INT("security.mac.cache_fslabel_in_vnode", - &mac_cache_fslabel_in_vnode); - static int mac_mmap_revocation = 1; SYSCTL_INT(_security_mac, OID_AUTO, mmap_revocation, CTLFLAG_RW, &mac_mmap_revocation, 0, "Revoke mmap access to files on subject " -- cgit v1.3