diff options
Diffstat (limited to 'sys/security/mac/mac_system.c')
| -rw-r--r-- | sys/security/mac/mac_system.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/sys/security/mac/mac_system.c b/sys/security/mac/mac_system.c index 4a377c0..b705bbd 100644 --- a/sys/security/mac/mac_system.c +++ b/sys/security/mac/mac_system.c @@ -78,7 +78,7 @@ mac_kenv_check_dump(struct ucred *cred) { int error; - MAC_CHECK_NOSLEEP(kenv_check_dump, cred); + MAC_POLICY_CHECK_NOSLEEP(kenv_check_dump, cred); MAC_CHECK_PROBE1(kenv_check_dump, error, cred); return (error); @@ -91,7 +91,7 @@ mac_kenv_check_get(struct ucred *cred, char *name) { int error; - MAC_CHECK_NOSLEEP(kenv_check_get, cred, name); + MAC_POLICY_CHECK_NOSLEEP(kenv_check_get, cred, name); MAC_CHECK_PROBE2(kenv_check_get, error, cred, name); return (error); @@ -105,7 +105,7 @@ mac_kenv_check_set(struct ucred *cred, char *name, char *value) { int error; - MAC_CHECK_NOSLEEP(kenv_check_set, cred, name, value); + MAC_POLICY_CHECK_NOSLEEP(kenv_check_set, cred, name, value); MAC_CHECK_PROBE3(kenv_check_set, error, cred, name, value); return (error); @@ -118,7 +118,7 @@ mac_kenv_check_unset(struct ucred *cred, char *name) { int error; - MAC_CHECK_NOSLEEP(kenv_check_unset, cred, name); + MAC_POLICY_CHECK_NOSLEEP(kenv_check_unset, cred, name); MAC_CHECK_PROBE2(kenv_check_unset, error, cred, name); return (error); @@ -133,7 +133,7 @@ mac_kld_check_load(struct ucred *cred, struct vnode *vp) ASSERT_VOP_LOCKED(vp, "mac_kld_check_load"); - MAC_CHECK(kld_check_load, cred, vp, vp->v_label); + MAC_POLICY_CHECK(kld_check_load, cred, vp, vp->v_label); MAC_CHECK_PROBE2(kld_check_load, error, cred, vp); return (error); @@ -146,7 +146,7 @@ mac_kld_check_stat(struct ucred *cred) { int error; - MAC_CHECK_NOSLEEP(kld_check_stat, cred); + MAC_POLICY_CHECK_NOSLEEP(kld_check_stat, cred); MAC_CHECK_PROBE1(kld_check_stat, error, cred); return (error); @@ -164,7 +164,7 @@ mac_system_check_acct(struct ucred *cred, struct vnode *vp) ASSERT_VOP_LOCKED(vp, "mac_system_check_acct"); } - MAC_CHECK(system_check_acct, cred, vp, + MAC_POLICY_CHECK(system_check_acct, cred, vp, vp != NULL ? vp->v_label : NULL); MAC_CHECK_PROBE2(system_check_acct, error, cred, vp); @@ -178,7 +178,7 @@ mac_system_check_reboot(struct ucred *cred, int howto) { int error; - MAC_CHECK_NOSLEEP(system_check_reboot, cred, howto); + MAC_POLICY_CHECK_NOSLEEP(system_check_reboot, cred, howto); MAC_CHECK_PROBE2(system_check_reboot, error, cred, howto); return (error); @@ -194,7 +194,7 @@ mac_system_check_swapon(struct ucred *cred, struct vnode *vp) ASSERT_VOP_LOCKED(vp, "mac_system_check_swapon"); - MAC_CHECK(system_check_swapon, cred, vp, vp->v_label); + MAC_POLICY_CHECK(system_check_swapon, cred, vp, vp->v_label); MAC_CHECK_PROBE2(system_check_swapon, error, cred, vp); return (error); @@ -210,7 +210,7 @@ mac_system_check_swapoff(struct ucred *cred, struct vnode *vp) ASSERT_VOP_LOCKED(vp, "mac_system_check_swapoff"); - MAC_CHECK(system_check_swapoff, cred, vp, vp->v_label); + MAC_POLICY_CHECK(system_check_swapoff, cred, vp, vp->v_label); MAC_CHECK_PROBE2(system_check_swapoff, error, cred, vp); return (error); @@ -229,7 +229,8 @@ mac_system_check_sysctl(struct ucred *cred, struct sysctl_oid *oidp, * XXXMAC: We would very much like to assert the SYSCTL_LOCK here, * but since it's not exported from kern_sysctl.c, we can't. */ - MAC_CHECK_NOSLEEP(system_check_sysctl, cred, oidp, arg1, arg2, req); + MAC_POLICY_CHECK_NOSLEEP(system_check_sysctl, cred, oidp, arg1, arg2, + req); MAC_CHECK_PROBE3(system_check_sysctl, error, cred, oidp, req); return (error); |
