d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge from MAC tree: rename mac_check_vnode_swapon() to

Browse Source 
mac_check_system_swapon(), to reflect the fact that the primary
object of this change is the running kernel as a whole, rather
than just the vnode.  We'll drop additional checks of this
class into the same check namespace, including reboot(),
sysctl(), et al.

Obtained from:	TrustedBSD Project
Sponsored by:	DARPA, Network Associates Laboratories
This commit is contained in:
Robert Watson 2002-10-27 06:54:06 +00:00
parent d21258022e
commit 03ce2c0c9b
14 changed files with 171 additions and 171 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
sys/kern/kern_mac.c
View File

@ -899,6 +899,10 @@ mac_policy_register(struct mac_policy_conf *mpc)
mpc->mpc_ops->mpo_check_socket_visible =
mpe->mpe_function;
break;
case MAC_CHECK_SYSTEM_SWAPON:
mpc->mpc_ops->mpo_check_system_swapon =
mpe->mpe_function;
break;
case MAC_CHECK_VNODE_ACCESS:
mpc->mpc_ops->mpo_check_vnode_access =
mpe->mpe_function;
@ -1019,10 +1023,6 @@ mac_policy_register(struct mac_policy_conf *mpc)
mpc->mpc_ops->mpo_check_vnode_stat =
mpe->mpe_function;
break;
case MAC_CHECK_VNODE_SWAPON:
mpc->mpc_ops->mpo_check_vnode_swapon =
mpe->mpe_function;
break;
case MAC_CHECK_VNODE_WRITE:
mpc->mpc_ops->mpo_check_vnode_write =
mpe->mpe_function;
@ -2303,20 +2303,6 @@ mac_check_vnode_stat(struct ucred *active_cred, struct ucred *file_cred,
return (error);
}
int
mac_check_vnode_swapon(struct ucred *cred, struct vnode *vp)
{
int error;
ASSERT_VOP_LOCKED(vp, "mac_check_vnode_swapon");
if (!mac_enforce_fs)
return (0);
MAC_CHECK(check_vnode_swapon, cred, vp, &vp->v_label);
return (error);
}
int
mac_check_vnode_write(struct ucred *active_cred, struct ucred *file_cred,
struct vnode *vp)
@ -3010,6 +2996,20 @@ mac_check_socket_visible(struct ucred *cred, struct socket *socket)
return (error);
}
int
mac_check_system_swapon(struct ucred *cred, struct vnode *vp)
{
int error;
ASSERT_VOP_LOCKED(vp, "mac_check_system_swapon");
if (!mac_enforce_fs)
return (0);
MAC_CHECK(check_system_swapon, cred, vp, &vp->v_label);
return (error);
}
int
mac_ioctl_ifnet_get(struct ucred *cred, struct ifreq *ifr,
struct ifnet *ifnet)

36
sys/security/mac/mac_framework.c
View File

@ -899,6 +899,10 @@ mac_policy_register(struct mac_policy_conf *mpc)
mpc->mpc_ops->mpo_check_socket_visible =
mpe->mpe_function;
break;
case MAC_CHECK_SYSTEM_SWAPON:
mpc->mpc_ops->mpo_check_system_swapon =
mpe->mpe_function;
break;
case MAC_CHECK_VNODE_ACCESS:
mpc->mpc_ops->mpo_check_vnode_access =
mpe->mpe_function;
@ -1019,10 +1023,6 @@ mac_policy_register(struct mac_policy_conf *mpc)
mpc->mpc_ops->mpo_check_vnode_stat =
mpe->mpe_function;
break;
case MAC_CHECK_VNODE_SWAPON:
mpc->mpc_ops->mpo_check_vnode_swapon =
mpe->mpe_function;
break;
case MAC_CHECK_VNODE_WRITE:
mpc->mpc_ops->mpo_check_vnode_write =
mpe->mpe_function;
@ -2303,20 +2303,6 @@ mac_check_vnode_stat(struct ucred *active_cred, struct ucred *file_cred,
return (error);
}
int
mac_check_vnode_swapon(struct ucred *cred, struct vnode *vp)
{
int error;
ASSERT_VOP_LOCKED(vp, "mac_check_vnode_swapon");
if (!mac_enforce_fs)
return (0);
MAC_CHECK(check_vnode_swapon, cred, vp, &vp->v_label);
return (error);
}
int
mac_check_vnode_write(struct ucred *active_cred, struct ucred *file_cred,
struct vnode *vp)
@ -3010,6 +2996,20 @@ mac_check_socket_visible(struct ucred *cred, struct socket *socket)
return (error);
}
int
mac_check_system_swapon(struct ucred *cred, struct vnode *vp)
{
int error;
ASSERT_VOP_LOCKED(vp, "mac_check_system_swapon");
if (!mac_enforce_fs)
return (0);
MAC_CHECK(check_system_swapon, cred, vp, &vp->v_label);
return (error);
}
int
mac_ioctl_ifnet_get(struct ucred *cred, struct ifreq *ifr,
struct ifnet *ifnet)

2
sys/security/mac/mac_framework.h
View File

@ -297,6 +297,7 @@ int mac_check_socket_listen(struct ucred *cred, struct socket *so);
int mac_check_socket_receive(struct ucred *cred, struct socket *so);
int mac_check_socket_send(struct ucred *cred, struct socket *so);
int mac_check_socket_visible(struct ucred *cred, struct socket *so);
int mac_check_system_swapon(struct ucred *cred, struct vnode *vp);
int mac_check_vnode_access(struct ucred *cred, struct vnode *vp,
int flags);
int mac_check_vnode_chdir(struct ucred *cred, struct vnode *dvp);
@ -347,7 +348,6 @@ int mac_check_vnode_setutimes(struct ucred *cred, struct vnode *vp,
struct timespec atime, struct timespec mtime);
int mac_check_vnode_stat(struct ucred *active_cred,
struct ucred *file_cred, struct vnode *vp);
int mac_check_vnode_swapon(struct ucred *cred, struct vnode *vp);
int mac_check_vnode_write(struct ucred *active_cred,
struct ucred *file_cred, struct vnode *vp);
int mac_getsockopt_label_get(struct ucred *cred, struct socket *so,

36
sys/security/mac/mac_internal.h
View File

@ -899,6 +899,10 @@ mac_policy_register(struct mac_policy_conf *mpc)
mpc->mpc_ops->mpo_check_socket_visible =
mpe->mpe_function;
break;
case MAC_CHECK_SYSTEM_SWAPON:
mpc->mpc_ops->mpo_check_system_swapon =
mpe->mpe_function;
break;
case MAC_CHECK_VNODE_ACCESS:
mpc->mpc_ops->mpo_check_vnode_access =
mpe->mpe_function;
@ -1019,10 +1023,6 @@ mac_policy_register(struct mac_policy_conf *mpc)
mpc->mpc_ops->mpo_check_vnode_stat =
mpe->mpe_function;
break;
case MAC_CHECK_VNODE_SWAPON:
mpc->mpc_ops->mpo_check_vnode_swapon =
mpe->mpe_function;
break;
case MAC_CHECK_VNODE_WRITE:
mpc->mpc_ops->mpo_check_vnode_write =
mpe->mpe_function;
@ -2303,20 +2303,6 @@ mac_check_vnode_stat(struct ucred *active_cred, struct ucred *file_cred,
return (error);
}
int
mac_check_vnode_swapon(struct ucred *cred, struct vnode *vp)
{
int error;
ASSERT_VOP_LOCKED(vp, "mac_check_vnode_swapon");
if (!mac_enforce_fs)
return (0);
MAC_CHECK(check_vnode_swapon, cred, vp, &vp->v_label);
return (error);
}
int
mac_check_vnode_write(struct ucred *active_cred, struct ucred *file_cred,
struct vnode *vp)
@ -3010,6 +2996,20 @@ mac_check_socket_visible(struct ucred *cred, struct socket *socket)
return (error);
}
int
mac_check_system_swapon(struct ucred *cred, struct vnode *vp)
{
int error;
ASSERT_VOP_LOCKED(vp, "mac_check_system_swapon");
if (!mac_enforce_fs)
return (0);
MAC_CHECK(check_system_swapon, cred, vp, &vp->v_label);
return (error);
}
int
mac_ioctl_ifnet_get(struct ucred *cred, struct ifreq *ifr,
struct ifnet *ifnet)

36
sys/security/mac/mac_net.c
View File

@ -899,6 +899,10 @@ mac_policy_register(struct mac_policy_conf *mpc)
mpc->mpc_ops->mpo_check_socket_visible =
mpe->mpe_function;
break;
case MAC_CHECK_SYSTEM_SWAPON:
mpc->mpc_ops->mpo_check_system_swapon =
mpe->mpe_function;
break;
case MAC_CHECK_VNODE_ACCESS:
mpc->mpc_ops->mpo_check_vnode_access =
mpe->mpe_function;
@ -1019,10 +1023,6 @@ mac_policy_register(struct mac_policy_conf *mpc)
mpc->mpc_ops->mpo_check_vnode_stat =
mpe->mpe_function;
break;
case MAC_CHECK_VNODE_SWAPON:
mpc->mpc_ops->mpo_check_vnode_swapon =
mpe->mpe_function;
break;
case MAC_CHECK_VNODE_WRITE:
mpc->mpc_ops->mpo_check_vnode_write =
mpe->mpe_function;
@ -2303,20 +2303,6 @@ mac_check_vnode_stat(struct ucred *active_cred, struct ucred *file_cred,
return (error);
}
int
mac_check_vnode_swapon(struct ucred *cred, struct vnode *vp)
{
int error;
ASSERT_VOP_LOCKED(vp, "mac_check_vnode_swapon");
if (!mac_enforce_fs)
return (0);
MAC_CHECK(check_vnode_swapon, cred, vp, &vp->v_label);
return (error);
}
int
mac_check_vnode_write(struct ucred *active_cred, struct ucred *file_cred,
struct vnode *vp)
@ -3010,6 +2996,20 @@ mac_check_socket_visible(struct ucred *cred, struct socket *socket)
return (error);
}
int
mac_check_system_swapon(struct ucred *cred, struct vnode *vp)
{
int error;
ASSERT_VOP_LOCKED(vp, "mac_check_system_swapon");
if (!mac_enforce_fs)
return (0);
MAC_CHECK(check_system_swapon, cred, vp, &vp->v_label);
return (error);
}
int
mac_ioctl_ifnet_get(struct ucred *cred, struct ifreq *ifr,
struct ifnet *ifnet)

36
sys/security/mac/mac_pipe.c
View File

@ -899,6 +899,10 @@ mac_policy_register(struct mac_policy_conf *mpc)
mpc->mpc_ops->mpo_check_socket_visible =
mpe->mpe_function;
break;
case MAC_CHECK_SYSTEM_SWAPON:
mpc->mpc_ops->mpo_check_system_swapon =
mpe->mpe_function;
break;
case MAC_CHECK_VNODE_ACCESS:
mpc->mpc_ops->mpo_check_vnode_access =
mpe->mpe_function;
@ -1019,10 +1023,6 @@ mac_policy_register(struct mac_policy_conf *mpc)
mpc->mpc_ops->mpo_check_vnode_stat =
mpe->mpe_function;
break;
case MAC_CHECK_VNODE_SWAPON:
mpc->mpc_ops->mpo_check_vnode_swapon =
mpe->mpe_function;
break;
case MAC_CHECK_VNODE_WRITE:
mpc->mpc_ops->mpo_check_vnode_write =
mpe->mpe_function;
@ -2303,20 +2303,6 @@ mac_check_vnode_stat(struct ucred *active_cred, struct ucred *file_cred,
return (error);
}
int
mac_check_vnode_swapon(struct ucred *cred, struct vnode *vp)
{
int error;
ASSERT_VOP_LOCKED(vp, "mac_check_vnode_swapon");
if (!mac_enforce_fs)
return (0);
MAC_CHECK(check_vnode_swapon, cred, vp, &vp->v_label);
return (error);
}
int
mac_check_vnode_write(struct ucred *active_cred, struct ucred *file_cred,
struct vnode *vp)
@ -3010,6 +2996,20 @@ mac_check_socket_visible(struct ucred *cred, struct socket *socket)
return (error);
}
int
mac_check_system_swapon(struct ucred *cred, struct vnode *vp)
{
int error;
ASSERT_VOP_LOCKED(vp, "mac_check_system_swapon");
if (!mac_enforce_fs)
return (0);
MAC_CHECK(check_system_swapon, cred, vp, &vp->v_label);
return (error);
}
int
mac_ioctl_ifnet_get(struct ucred *cred, struct ifreq *ifr,
struct ifnet *ifnet)

6
sys/security/mac/mac_policy.h
View File

@ -310,6 +310,8 @@ struct mac_policy_ops {
struct socket *so, struct label *socketlabel);
int (*mpo_check_socket_visible)(struct ucred *cred,
struct socket *so, struct label *socketlabel);
int (*mpo_check_system_swapon)(struct ucred *cred,
struct vnode *vp, struct label *label);
int (*mpo_check_vnode_access)(struct ucred *cred,
struct vnode *vp, struct label *label, int flags);
int (*mpo_check_vnode_chdir)(struct ucred *cred,
@ -386,8 +388,6 @@ struct mac_policy_ops {
int (*mpo_check_vnode_stat)(struct ucred *active_cred,
struct ucred *file_cred, struct vnode *vp,
struct label *label);
int (*mpo_check_vnode_swapon)(struct ucred *cred,
struct vnode *vp, struct label *label);
int (*mpo_check_vnode_write)(struct ucred *active_cred,
struct ucred *file_cred, struct vnode *vp,
struct label *label);
@ -502,6 +502,7 @@ enum mac_op_constant {
MAC_CHECK_SOCKET_RELABEL,
MAC_CHECK_SOCKET_SEND,
MAC_CHECK_SOCKET_VISIBLE,
MAC_CHECK_SYSTEM_SWAPON,
MAC_CHECK_VNODE_ACCESS,
MAC_CHECK_VNODE_CHDIR,
MAC_CHECK_VNODE_CHROOT,
@ -532,7 +533,6 @@ enum mac_op_constant {
MAC_CHECK_VNODE_SETOWNER,
MAC_CHECK_VNODE_SETUTIMES,
MAC_CHECK_VNODE_STAT,
MAC_CHECK_VNODE_SWAPON,
MAC_CHECK_VNODE_WRITE,
};

36
sys/security/mac/mac_process.c
View File

@ -899,6 +899,10 @@ mac_policy_register(struct mac_policy_conf *mpc)
mpc->mpc_ops->mpo_check_socket_visible =
mpe->mpe_function;
break;
case MAC_CHECK_SYSTEM_SWAPON:
mpc->mpc_ops->mpo_check_system_swapon =
mpe->mpe_function;
break;
case MAC_CHECK_VNODE_ACCESS:
mpc->mpc_ops->mpo_check_vnode_access =
mpe->mpe_function;
@ -1019,10 +1023,6 @@ mac_policy_register(struct mac_policy_conf *mpc)
mpc->mpc_ops->mpo_check_vnode_stat =
mpe->mpe_function;
break;
case MAC_CHECK_VNODE_SWAPON:
mpc->mpc_ops->mpo_check_vnode_swapon =
mpe->mpe_function;
break;
case MAC_CHECK_VNODE_WRITE:
mpc->mpc_ops->mpo_check_vnode_write =
mpe->mpe_function;
@ -2303,20 +2303,6 @@ mac_check_vnode_stat(struct ucred *active_cred, struct ucred *file_cred,
return (error);
}
int
mac_check_vnode_swapon(struct ucred *cred, struct vnode *vp)
{
int error;
ASSERT_VOP_LOCKED(vp, "mac_check_vnode_swapon");
if (!mac_enforce_fs)
return (0);
MAC_CHECK(check_vnode_swapon, cred, vp, &vp->v_label);
return (error);
}
int
mac_check_vnode_write(struct ucred *active_cred, struct ucred *file_cred,
struct vnode *vp)
@ -3010,6 +2996,20 @@ mac_check_socket_visible(struct ucred *cred, struct socket *socket)
return (error);
}
int
mac_check_system_swapon(struct ucred *cred, struct vnode *vp)
{
int error;
ASSERT_VOP_LOCKED(vp, "mac_check_system_swapon");
if (!mac_enforce_fs)
return (0);
MAC_CHECK(check_system_swapon, cred, vp, &vp->v_label);
return (error);
}
int
mac_ioctl_ifnet_get(struct ucred *cred, struct ifreq *ifr,
struct ifnet *ifnet)

36
sys/security/mac/mac_syscalls.c
View File

@ -899,6 +899,10 @@ mac_policy_register(struct mac_policy_conf *mpc)
mpc->mpc_ops->mpo_check_socket_visible =
mpe->mpe_function;
break;
case MAC_CHECK_SYSTEM_SWAPON:
mpc->mpc_ops->mpo_check_system_swapon =
mpe->mpe_function;
break;
case MAC_CHECK_VNODE_ACCESS:
mpc->mpc_ops->mpo_check_vnode_access =
mpe->mpe_function;
@ -1019,10 +1023,6 @@ mac_policy_register(struct mac_policy_conf *mpc)
mpc->mpc_ops->mpo_check_vnode_stat =
mpe->mpe_function;
break;
case MAC_CHECK_VNODE_SWAPON:
mpc->mpc_ops->mpo_check_vnode_swapon =
mpe->mpe_function;
break;
case MAC_CHECK_VNODE_WRITE:
mpc->mpc_ops->mpo_check_vnode_write =
mpe->mpe_function;
@ -2303,20 +2303,6 @@ mac_check_vnode_stat(struct ucred *active_cred, struct ucred *file_cred,
return (error);
}
int
mac_check_vnode_swapon(struct ucred *cred, struct vnode *vp)
{
int error;
ASSERT_VOP_LOCKED(vp, "mac_check_vnode_swapon");
if (!mac_enforce_fs)
return (0);
MAC_CHECK(check_vnode_swapon, cred, vp, &vp->v_label);
return (error);
}
int
mac_check_vnode_write(struct ucred *active_cred, struct ucred *file_cred,
struct vnode *vp)
@ -3010,6 +2996,20 @@ mac_check_socket_visible(struct ucred *cred, struct socket *socket)
return (error);
}
int
mac_check_system_swapon(struct ucred *cred, struct vnode *vp)
{
int error;
ASSERT_VOP_LOCKED(vp, "mac_check_system_swapon");
if (!mac_enforce_fs)
return (0);
MAC_CHECK(check_system_swapon, cred, vp, &vp->v_label);
return (error);
}
int
mac_ioctl_ifnet_get(struct ucred *cred, struct ifreq *ifr,
struct ifnet *ifnet)

36
sys/security/mac/mac_system.c
View File

@ -899,6 +899,10 @@ mac_policy_register(struct mac_policy_conf *mpc)
mpc->mpc_ops->mpo_check_socket_visible =
mpe->mpe_function;
break;
case MAC_CHECK_SYSTEM_SWAPON:
mpc->mpc_ops->mpo_check_system_swapon =
mpe->mpe_function;
break;
case MAC_CHECK_VNODE_ACCESS:
mpc->mpc_ops->mpo_check_vnode_access =
mpe->mpe_function;
@ -1019,10 +1023,6 @@ mac_policy_register(struct mac_policy_conf *mpc)
mpc->mpc_ops->mpo_check_vnode_stat =
mpe->mpe_function;
break;
case MAC_CHECK_VNODE_SWAPON:
mpc->mpc_ops->mpo_check_vnode_swapon =
mpe->mpe_function;
break;
case MAC_CHECK_VNODE_WRITE:
mpc->mpc_ops->mpo_check_vnode_write =
mpe->mpe_function;
@ -2303,20 +2303,6 @@ mac_check_vnode_stat(struct ucred *active_cred, struct ucred *file_cred,
return (error);
}
int
mac_check_vnode_swapon(struct ucred *cred, struct vnode *vp)
{
int error;
ASSERT_VOP_LOCKED(vp, "mac_check_vnode_swapon");
if (!mac_enforce_fs)
return (0);
MAC_CHECK(check_vnode_swapon, cred, vp, &vp->v_label);
return (error);
}
int
mac_check_vnode_write(struct ucred *active_cred, struct ucred *file_cred,
struct vnode *vp)
@ -3010,6 +2996,20 @@ mac_check_socket_visible(struct ucred *cred, struct socket *socket)
return (error);
}
int
mac_check_system_swapon(struct ucred *cred, struct vnode *vp)
{
int error;
ASSERT_VOP_LOCKED(vp, "mac_check_system_swapon");
if (!mac_enforce_fs)
return (0);
MAC_CHECK(check_system_swapon, cred, vp, &vp->v_label);
return (error);
}
int
mac_ioctl_ifnet_get(struct ucred *cred, struct ifreq *ifr,
struct ifnet *ifnet)

36
sys/security/mac/mac_vfs.c
View File

@ -899,6 +899,10 @@ mac_policy_register(struct mac_policy_conf *mpc)
mpc->mpc_ops->mpo_check_socket_visible =
mpe->mpe_function;
break;
case MAC_CHECK_SYSTEM_SWAPON:
mpc->mpc_ops->mpo_check_system_swapon =
mpe->mpe_function;
break;
case MAC_CHECK_VNODE_ACCESS:
mpc->mpc_ops->mpo_check_vnode_access =
mpe->mpe_function;
@ -1019,10 +1023,6 @@ mac_policy_register(struct mac_policy_conf *mpc)
mpc->mpc_ops->mpo_check_vnode_stat =
mpe->mpe_function;
break;
case MAC_CHECK_VNODE_SWAPON:
mpc->mpc_ops->mpo_check_vnode_swapon =
mpe->mpe_function;
break;
case MAC_CHECK_VNODE_WRITE:
mpc->mpc_ops->mpo_check_vnode_write =
mpe->mpe_function;
@ -2303,20 +2303,6 @@ mac_check_vnode_stat(struct ucred *active_cred, struct ucred *file_cred,
return (error);
}
int
mac_check_vnode_swapon(struct ucred *cred, struct vnode *vp)
{
int error;
ASSERT_VOP_LOCKED(vp, "mac_check_vnode_swapon");
if (!mac_enforce_fs)
return (0);
MAC_CHECK(check_vnode_swapon, cred, vp, &vp->v_label);
return (error);
}
int
mac_check_vnode_write(struct ucred *active_cred, struct ucred *file_cred,
struct vnode *vp)
@ -3010,6 +2996,20 @@ mac_check_socket_visible(struct ucred *cred, struct socket *socket)
return (error);
}
int
mac_check_system_swapon(struct ucred *cred, struct vnode *vp)
{
int error;
ASSERT_VOP_LOCKED(vp, "mac_check_system_swapon");
if (!mac_enforce_fs)
return (0);
MAC_CHECK(check_system_swapon, cred, vp, &vp->v_label);
return (error);
}
int
mac_ioctl_ifnet_get(struct ucred *cred, struct ifreq *ifr,
struct ifnet *ifnet)

2
sys/sys/mac.h
View File

@ -297,6 +297,7 @@ int mac_check_socket_listen(struct ucred *cred, struct socket *so);
int mac_check_socket_receive(struct ucred *cred, struct socket *so);
int mac_check_socket_send(struct ucred *cred, struct socket *so);
int mac_check_socket_visible(struct ucred *cred, struct socket *so);
int mac_check_system_swapon(struct ucred *cred, struct vnode *vp);
int mac_check_vnode_access(struct ucred *cred, struct vnode *vp,
int flags);
int mac_check_vnode_chdir(struct ucred *cred, struct vnode *dvp);
@ -347,7 +348,6 @@ int mac_check_vnode_setutimes(struct ucred *cred, struct vnode *vp,
struct timespec atime, struct timespec mtime);
int mac_check_vnode_stat(struct ucred *active_cred,
struct ucred *file_cred, struct vnode *vp);
int mac_check_vnode_swapon(struct ucred *cred, struct vnode *vp);
int mac_check_vnode_write(struct ucred *active_cred,
struct ucred *file_cred, struct vnode *vp);
int mac_getsockopt_label_get(struct ucred *cred, struct socket *so,

6
sys/sys/mac_policy.h
View File

@ -310,6 +310,8 @@ struct mac_policy_ops {
struct socket *so, struct label *socketlabel);
int (*mpo_check_socket_visible)(struct ucred *cred,
struct socket *so, struct label *socketlabel);
int (*mpo_check_system_swapon)(struct ucred *cred,
struct vnode *vp, struct label *label);
int (*mpo_check_vnode_access)(struct ucred *cred,
struct vnode *vp, struct label *label, int flags);
int (*mpo_check_vnode_chdir)(struct ucred *cred,
@ -386,8 +388,6 @@ struct mac_policy_ops {
int (*mpo_check_vnode_stat)(struct ucred *active_cred,
struct ucred *file_cred, struct vnode *vp,
struct label *label);
int (*mpo_check_vnode_swapon)(struct ucred *cred,
struct vnode *vp, struct label *label);
int (*mpo_check_vnode_write)(struct ucred *active_cred,
struct ucred *file_cred, struct vnode *vp,
struct label *label);
@ -502,6 +502,7 @@ enum mac_op_constant {
MAC_CHECK_SOCKET_RELABEL,
MAC_CHECK_SOCKET_SEND,
MAC_CHECK_SOCKET_VISIBLE,
MAC_CHECK_SYSTEM_SWAPON,
MAC_CHECK_VNODE_ACCESS,
MAC_CHECK_VNODE_CHDIR,
MAC_CHECK_VNODE_CHROOT,
@ -532,7 +533,6 @@ enum mac_op_constant {
MAC_CHECK_VNODE_SETOWNER,
MAC_CHECK_VNODE_SETUTIMES,
MAC_CHECK_VNODE_STAT,
MAC_CHECK_VNODE_SWAPON,
MAC_CHECK_VNODE_WRITE,
};

2
sys/vm/vm_swap.c
View File

@ -290,7 +290,7 @@ swaponvp(td, vp, dev, nblks)
found:
(void) vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
#ifdef MAC
error = mac_check_vnode_swapon(td->td_ucred, vp);
error = mac_check_system_swapon(td->td_ucred, vp);
if (error == 0)
#endif
error = VOP_OPEN(vp, FREAD | FWRITE, td->td_ucred, td);