diff options
Diffstat (limited to 'sys/security/mac/mac_framework.c')
-rw-r--r-- | sys/security/mac/mac_framework.c | 202 |
1 files changed, 101 insertions, 101 deletions
diff --git a/sys/security/mac/mac_framework.c b/sys/security/mac/mac_framework.c index 8df223d..dd5d2b3 100644 --- a/sys/security/mac/mac_framework.c +++ b/sys/security/mac/mac_framework.c @@ -1043,28 +1043,14 @@ mac_init_structmac(struct mac *mac) mac->m_macflags = MAC_FLAG_INITIALIZED; } -int -mac_init_mbuf(struct mbuf *m, int flag) -{ - KASSERT(m->m_flags & M_PKTHDR, ("mac_init_mbuf on non-header mbuf")); - - mac_init_label(&m->m_pkthdr.label); - - MAC_PERFORM(init_mbuf_label, &m->m_pkthdr.label, flag); -#ifdef MAC_DEBUG - atomic_add_int(&nmacmbufs, 1); -#endif - return (0); -} - void -mac_destroy_mbuf(struct mbuf *m) +mac_init_bpfdesc(struct bpf_d *bpf_d) { - MAC_PERFORM(destroy_mbuf_label, &m->m_pkthdr.label); - mac_destroy_label(&m->m_pkthdr.label); + mac_init_label(&bpf_d->bd_label); + MAC_PERFORM(init_bpfdesc_label, &bpf_d->bd_label); #ifdef MAC_DEBUG - atomic_subtract_int(&nmacmbufs, 1); + atomic_add_int(&nmacbpfdescs, 1); #endif } @@ -1080,13 +1066,13 @@ mac_init_cred(struct ucred *cr) } void -mac_destroy_cred(struct ucred *cr) +mac_init_devfsdirent(struct devfs_dirent *de) { - MAC_PERFORM(destroy_cred_label, &cr->cr_label); - mac_destroy_label(&cr->cr_label); + mac_init_label(&de->de_label); + MAC_PERFORM(init_devfsdirent_label, &de->de_label); #ifdef MAC_DEBUG - atomic_subtract_int(&nmaccreds, 1); + atomic_add_int(&nmacdevfsdirents, 1); #endif } @@ -1102,35 +1088,55 @@ mac_init_ifnet(struct ifnet *ifp) } void -mac_destroy_ifnet(struct ifnet *ifp) +mac_init_ipq(struct ipq *ipq) { - MAC_PERFORM(destroy_ifnet_label, &ifp->if_label); - mac_destroy_label(&ifp->if_label); + mac_init_label(&ipq->ipq_label); + MAC_PERFORM(init_ipq_label, &ipq->ipq_label); #ifdef MAC_DEBUG - atomic_subtract_int(&nmacifnets, 1); + atomic_add_int(&nmacipqs, 1); #endif } +int +mac_init_mbuf(struct mbuf *m, int flag) +{ + KASSERT(m->m_flags & M_PKTHDR, ("mac_init_mbuf on non-header mbuf")); + + mac_init_label(&m->m_pkthdr.label); + + MAC_PERFORM(init_mbuf_label, &m->m_pkthdr.label, flag); +#ifdef MAC_DEBUG + atomic_add_int(&nmacmbufs, 1); +#endif + return (0); +} + void -mac_init_ipq(struct ipq *ipq) +mac_init_mount(struct mount *mp) { - mac_init_label(&ipq->ipq_label); - MAC_PERFORM(init_ipq_label, &ipq->ipq_label); + mac_init_label(&mp->mnt_mntlabel); + mac_init_label(&mp->mnt_fslabel); + MAC_PERFORM(init_mount_label, &mp->mnt_mntlabel); + MAC_PERFORM(init_mount_fs_label, &mp->mnt_fslabel); #ifdef MAC_DEBUG - atomic_add_int(&nmacipqs, 1); + atomic_add_int(&nmacmounts, 1); #endif } void -mac_destroy_ipq(struct ipq *ipq) +mac_init_pipe(struct pipe *pipe) { + struct label *label; - MAC_PERFORM(destroy_ipq_label, &ipq->ipq_label); - mac_destroy_label(&ipq->ipq_label); + label = malloc(sizeof(struct label), M_MACPIPELABEL, M_ZERO|M_WAITOK); + mac_init_label(label); + pipe->pipe_label = label; + pipe->pipe_peer->pipe_label = label; + MAC_PERFORM(init_pipe_label, pipe->pipe_label); #ifdef MAC_DEBUG - atomic_subtract_int(&nmacipqs, 1); + atomic_add_int(&nmacpipes, 1); #endif } @@ -1147,157 +1153,151 @@ mac_init_socket(struct socket *socket) #endif } -void -mac_destroy_socket(struct socket *socket) +static void +mac_init_temp(struct label *label) { - MAC_PERFORM(destroy_socket_label, &socket->so_label); - MAC_PERFORM(destroy_socket_peer_label, &socket->so_peerlabel); - mac_destroy_label(&socket->so_label); - mac_destroy_label(&socket->so_peerlabel); + mac_init_label(label); + MAC_PERFORM(init_temp_label, label); #ifdef MAC_DEBUG - atomic_subtract_int(&nmacsockets, 1); + atomic_add_int(&nmactemp, 1); #endif } void -mac_init_pipe(struct pipe *pipe) +mac_init_vnode(struct vnode *vp) { - struct label *label; - label = malloc(sizeof(struct label), M_MACPIPELABEL, M_ZERO|M_WAITOK); - mac_init_label(label); - pipe->pipe_label = label; - pipe->pipe_peer->pipe_label = label; - MAC_PERFORM(init_pipe_label, pipe->pipe_label); + mac_init_label(&vp->v_label); + MAC_PERFORM(init_vnode_label, &vp->v_label); #ifdef MAC_DEBUG - atomic_add_int(&nmacpipes, 1); + atomic_add_int(&nmacvnodes, 1); #endif } void -mac_destroy_pipe(struct pipe *pipe) +mac_destroy_bpfdesc(struct bpf_d *bpf_d) { - MAC_PERFORM(destroy_pipe_label, pipe->pipe_label); - mac_destroy_label(pipe->pipe_label); - free(pipe->pipe_label, M_MACPIPELABEL); + MAC_PERFORM(destroy_bpfdesc_label, &bpf_d->bd_label); + mac_destroy_label(&bpf_d->bd_label); #ifdef MAC_DEBUG - atomic_subtract_int(&nmacpipes, 1); + atomic_subtract_int(&nmacbpfdescs, 1); #endif } void -mac_init_bpfdesc(struct bpf_d *bpf_d) +mac_destroy_cred(struct ucred *cr) { - mac_init_label(&bpf_d->bd_label); - MAC_PERFORM(init_bpfdesc_label, &bpf_d->bd_label); + MAC_PERFORM(destroy_cred_label, &cr->cr_label); + mac_destroy_label(&cr->cr_label); #ifdef MAC_DEBUG - atomic_add_int(&nmacbpfdescs, 1); + atomic_subtract_int(&nmaccreds, 1); #endif } void -mac_destroy_bpfdesc(struct bpf_d *bpf_d) +mac_destroy_devfsdirent(struct devfs_dirent *de) { - MAC_PERFORM(destroy_bpfdesc_label, &bpf_d->bd_label); - mac_destroy_label(&bpf_d->bd_label); + MAC_PERFORM(destroy_devfsdirent_label, &de->de_label); + mac_destroy_label(&de->de_label); #ifdef MAC_DEBUG - atomic_subtract_int(&nmacbpfdescs, 1); + atomic_subtract_int(&nmacdevfsdirents, 1); #endif } void -mac_init_mount(struct mount *mp) +mac_destroy_ifnet(struct ifnet *ifp) { - mac_init_label(&mp->mnt_mntlabel); - mac_init_label(&mp->mnt_fslabel); - MAC_PERFORM(init_mount_label, &mp->mnt_mntlabel); - MAC_PERFORM(init_mount_fs_label, &mp->mnt_fslabel); + MAC_PERFORM(destroy_ifnet_label, &ifp->if_label); + mac_destroy_label(&ifp->if_label); #ifdef MAC_DEBUG - atomic_add_int(&nmacmounts, 1); + atomic_subtract_int(&nmacifnets, 1); #endif } void -mac_destroy_mount(struct mount *mp) +mac_destroy_ipq(struct ipq *ipq) { - MAC_PERFORM(destroy_mount_label, &mp->mnt_mntlabel); - MAC_PERFORM(destroy_mount_fs_label, &mp->mnt_fslabel); - mac_destroy_label(&mp->mnt_fslabel); - mac_destroy_label(&mp->mnt_mntlabel); + MAC_PERFORM(destroy_ipq_label, &ipq->ipq_label); + mac_destroy_label(&ipq->ipq_label); #ifdef MAC_DEBUG - atomic_subtract_int(&nmacmounts, 1); + atomic_subtract_int(&nmacipqs, 1); #endif } -static void -mac_init_temp(struct label *label) +void +mac_destroy_mbuf(struct mbuf *m) { - mac_init_label(label); - MAC_PERFORM(init_temp_label, label); + MAC_PERFORM(destroy_mbuf_label, &m->m_pkthdr.label); + mac_destroy_label(&m->m_pkthdr.label); #ifdef MAC_DEBUG - atomic_add_int(&nmactemp, 1); + atomic_subtract_int(&nmacmbufs, 1); #endif } -static void -mac_destroy_temp(struct label *label) +void +mac_destroy_mount(struct mount *mp) { - MAC_PERFORM(destroy_temp_label, label); - mac_destroy_label(label); + MAC_PERFORM(destroy_mount_label, &mp->mnt_mntlabel); + MAC_PERFORM(destroy_mount_fs_label, &mp->mnt_fslabel); + mac_destroy_label(&mp->mnt_fslabel); + mac_destroy_label(&mp->mnt_mntlabel); #ifdef MAC_DEBUG - atomic_subtract_int(&nmactemp, 1); + atomic_subtract_int(&nmacmounts, 1); #endif } void -mac_init_vnode(struct vnode *vp) +mac_destroy_pipe(struct pipe *pipe) { - mac_init_label(&vp->v_label); - MAC_PERFORM(init_vnode_label, &vp->v_label); + MAC_PERFORM(destroy_pipe_label, pipe->pipe_label); + mac_destroy_label(pipe->pipe_label); + free(pipe->pipe_label, M_MACPIPELABEL); #ifdef MAC_DEBUG - atomic_add_int(&nmacvnodes, 1); + atomic_subtract_int(&nmacpipes, 1); #endif } void -mac_destroy_vnode(struct vnode *vp) +mac_destroy_socket(struct socket *socket) { - MAC_PERFORM(destroy_vnode_label, &vp->v_label); - mac_destroy_label(&vp->v_label); + MAC_PERFORM(destroy_socket_label, &socket->so_label); + MAC_PERFORM(destroy_socket_peer_label, &socket->so_peerlabel); + mac_destroy_label(&socket->so_label); + mac_destroy_label(&socket->so_peerlabel); #ifdef MAC_DEBUG - atomic_subtract_int(&nmacvnodes, 1); + atomic_subtract_int(&nmacsockets, 1); #endif } -void -mac_init_devfsdirent(struct devfs_dirent *de) +static void +mac_destroy_temp(struct label *label) { - mac_init_label(&de->de_label); - MAC_PERFORM(init_devfsdirent_label, &de->de_label); + MAC_PERFORM(destroy_temp_label, label); + mac_destroy_label(label); #ifdef MAC_DEBUG - atomic_add_int(&nmacdevfsdirents, 1); + atomic_subtract_int(&nmactemp, 1); #endif } void -mac_destroy_devfsdirent(struct devfs_dirent *de) +mac_destroy_vnode(struct vnode *vp) { - MAC_PERFORM(destroy_devfsdirent_label, &de->de_label); - mac_destroy_label(&de->de_label); + MAC_PERFORM(destroy_vnode_label, &vp->v_label); + mac_destroy_label(&vp->v_label); #ifdef MAC_DEBUG - atomic_subtract_int(&nmacdevfsdirents, 1); + atomic_subtract_int(&nmacvnodes, 1); #endif } |