39c39
< * $FreeBSD: head/sys/security/mac/mac_system.c 102103 2002-08-19 15:30:30Z rwatson $
---
> * $FreeBSD: head/sys/security/mac/mac_system.c 102112 2002-08-19 16:43:25Z rwatson $
758,761d757
< case MAC_CHECK_VNODE_OP:
< mpc->mpc_ops->mpo_check_vnode_op =
< mpe->mpe_function;
< break;
765a762,769
> case MAC_CHECK_VNODE_POLL:
> mpc->mpc_ops->mpo_check_vnode_poll =
> mpe->mpe_function;
> break;
> case MAC_CHECK_VNODE_READ:
> mpc->mpc_ops->mpo_check_vnode_read =
> mpe->mpe_function;
> break;
817a822,825
> case MAC_CHECK_VNODE_WRITE:
> mpc->mpc_ops->mpo_check_vnode_write =
> mpe->mpe_function;
> break;
1765c1773
< mac_check_vnode_op(struct ucred *cred, struct vnode *vp, int op)
---
> mac_check_vnode_open(struct ucred *cred, struct vnode *vp, mode_t acc_mode)
1768a1777,1778
> ASSERT_VOP_LOCKED(vp, "mac_check_vnode_open");
>
1772c1782,1784
< ASSERT_VOP_LOCKED(vp, "mac_check_vnode_op");
---
> error = vn_refreshlabel(vp, cred);
> if (error)
> return (error);
1773a1786,1799
> MAC_CHECK(check_vnode_open, cred, vp, &vp->v_label, acc_mode);
> return (error);
> }
>
> int
> mac_check_vnode_poll(struct ucred *cred, struct vnode *vp)
> {
> int error;
>
> ASSERT_VOP_LOCKED(vp, "mac_check_vnode_poll");
>
> if (!mac_enforce_fs)
> return (0);
>
1778c1804
< MAC_CHECK(check_vnode_op, cred, vp, &vp->v_label, op);
---
> MAC_CHECK(check_vnode_poll, cred, vp, &vp->v_label);
1784c1810
< mac_check_vnode_open(struct ucred *cred, struct vnode *vp, mode_t acc_mode)
---
> mac_check_vnode_read(struct ucred *cred, struct vnode *vp)
1788c1814
< ASSERT_VOP_LOCKED(vp, "mac_check_vnode_open");
---
> ASSERT_VOP_LOCKED(vp, "mac_check_vnode_read");
1797c1823,1824
< MAC_CHECK(check_vnode_open, cred, vp, &vp->v_label, acc_mode);
---
> MAC_CHECK(check_vnode_read, cred, vp, &vp->v_label);
>
2052a2080,2099
> int
> mac_check_vnode_write(struct ucred *cred, struct vnode *vp)
> {
> int error;
>
> ASSERT_VOP_LOCKED(vp, "mac_check_vnode_write");
>
> if (!mac_enforce_fs)
> return (0);
>
> error = vn_refreshlabel(vp, cred);
> if (error)
> return (error);
>
> MAC_CHECK(check_vnode_write, cred, vp, &vp->v_label);
>
> return (error);
> }
>
>