diff options
| -rw-r--r-- | sys/security/mac_biba/mac_biba.c | 13 | ||||
| -rw-r--r-- | sys/security/mac_mls/mac_mls.c | 13 |
2 files changed, 2 insertions, 24 deletions
diff --git a/sys/security/mac_biba/mac_biba.c b/sys/security/mac_biba/mac_biba.c index 6a394a8..17c61df 100644 --- a/sys/security/mac_biba/mac_biba.c +++ b/sys/security/mac_biba/mac_biba.c @@ -118,9 +118,6 @@ static int mac_biba_slot; MALLOC_DEFINE(M_MACBIBA, "biba label", "MAC/Biba labels"); -static int mac_biba_check_vnode_open(struct ucred *cred, struct vnode *vp, - struct label *vnodelabel, mode_t acc_mode); - static struct mac_biba * biba_alloc(int flag) { @@ -1505,14 +1502,6 @@ mac_biba_check_socket_visible(struct ucred *cred, struct socket *socket, } static int -mac_biba_check_vnode_access(struct ucred *cred, struct vnode *vp, - struct label *label, mode_t flags) -{ - - return (mac_biba_check_vnode_open(cred, vp, label, flags)); -} - -static int mac_biba_check_vnode_chdir(struct ucred *cred, struct vnode *dvp, struct label *dlabel) { @@ -2274,7 +2263,7 @@ static struct mac_policy_op_entry mac_biba_ops[] = { MAC_CHECK_SOCKET_VISIBLE, (macop_t)mac_biba_check_socket_visible }, { MAC_CHECK_VNODE_ACCESS, - (macop_t)mac_biba_check_vnode_access }, + (macop_t)mac_biba_check_vnode_open }, { MAC_CHECK_VNODE_CHDIR, (macop_t)mac_biba_check_vnode_chdir }, { MAC_CHECK_VNODE_CHROOT, diff --git a/sys/security/mac_mls/mac_mls.c b/sys/security/mac_mls/mac_mls.c index 345592b..63150d3 100644 --- a/sys/security/mac_mls/mac_mls.c +++ b/sys/security/mac_mls/mac_mls.c @@ -107,9 +107,6 @@ static int mac_mls_slot; MALLOC_DEFINE(M_MACMLS, "mls label", "MAC/MLS labels"); -static int mac_mls_check_vnode_open(struct ucred *cred, struct vnode *vp, - struct label *vnodelabel, mode_t acc_mode); - static struct mac_mls * mls_alloc(int flag) { @@ -1462,14 +1459,6 @@ mac_mls_check_socket_visible(struct ucred *cred, struct socket *socket, } static int -mac_mls_check_vnode_access(struct ucred *cred, struct vnode *vp, - struct label *label, mode_t flags) -{ - - return (mac_mls_check_vnode_open(cred, vp, label, flags)); -} - -static int mac_mls_check_vnode_chdir(struct ucred *cred, struct vnode *dvp, struct label *dlabel) { @@ -2231,7 +2220,7 @@ static struct mac_policy_op_entry mac_mls_ops[] = { MAC_CHECK_SOCKET_VISIBLE, (macop_t)mac_mls_check_socket_visible }, { MAC_CHECK_VNODE_ACCESS, - (macop_t)mac_mls_check_vnode_access }, + (macop_t)mac_mls_check_vnode_open }, { MAC_CHECK_VNODE_CHDIR, (macop_t)mac_mls_check_vnode_chdir }, { MAC_CHECK_VNODE_CHROOT, |
