summaryrefslogtreecommitdiffstats
path: root/sys/security/mac_biba
diff options
context:
space:
mode:
authorrwatson <rwatson@FreeBSD.org>2002-10-21 16:39:12 +0000
committerrwatson <rwatson@FreeBSD.org>2002-10-21 16:39:12 +0000
commit963bded1fb2f4ecfdaa5a4ec70ab3f869451e270 (patch)
treedbcc5fbe026a55102da4486bf1c825a5388748b7 /sys/security/mac_biba
parentec031d49239e57b45533903e045aebb509b6f768 (diff)
downloadFreeBSD-src-963bded1fb2f4ecfdaa5a4ec70ab3f869451e270.zip
FreeBSD-src-963bded1fb2f4ecfdaa5a4ec70ab3f869451e270.tar.gz
Since the Biba and MLS access checks are identical to the open checks,
collapse the two cases more cleanly: rather than wrapping an access check around open, simply provide the open implementation for the access vector entry. No functional change. Obtained from: TrustedBSD Project Sponsored by: DARPA, Network Associates Laboratories
Diffstat (limited to 'sys/security/mac_biba')
-rw-r--r--sys/security/mac_biba/mac_biba.c13
1 files changed, 1 insertions, 12 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,
OpenPOWER on IntegriCloud