Sort entry points in mac_framework.h and mac_policy.h alphabetically by

primary object type, and then by secondarily by method name.  This sorts
entry points relating to particular objects, such as pipes, sockets, and
vnodes together.

Sponsored by:	SPARTA (original patches against Mac OS X)
Obtained from:	TrustedBSD Project, Apple Computer

1 files changed, 175 insertions, 190 deletions

diff --git a/sys/security/mac/mac_framework.h b/sys/security/mac/mac_framework.h
index c3c0b1e..9e551d8 100644
--- a/sys/security/mac/mac_framework.h
+++ b/sys/security/mac/mac_framework.h
@@ -90,238 +90,143 @@ struct vop_setlabel_args;
 /*
  * Kernel functions to manage and evaluate labels.
  */
-void	mac_bpfdesc_init(struct bpf_d *);
-void	mac_cred_init(struct ucred *);
-void	mac_devfs_init(struct devfs_dirent *);
-void	mac_ifnet_init(struct ifnet *);
-int	mac_inpcb_init(struct inpcb *, int);
-void	mac_sysvmsg_init(struct msg *);
-void	mac_sysvmsq_init(struct msqid_kernel *);
-void	mac_sysvsem_init(struct semid_kernel *);
-void	mac_sysvshm_init(struct shmid_kernel *);
-int	mac_ipq_init(struct ipq *, int);
-int	mac_socket_init(struct socket *, int);
-void	mac_pipe_init(struct pipepair *);
-void	mac_posixsem_init(struct ksem *);
-int	mac_mbuf_init(struct mbuf *, int);
-int	mac_mbuf_tag_init(struct m_tag *, int);
-void	mac_mount_init(struct mount *);
-void	mac_proc_init(struct proc *);
-void	mac_vnode_init(struct vnode *);
-void	mac_mbuf_copy(struct mbuf *, struct mbuf *);
-void	mac_mbuf_tag_copy(struct m_tag *, struct m_tag *);
-void	mac_vnode_copy_label(struct label *, struct label *);
+int	mac_bpfdesc_check_receive(struct bpf_d *d, struct ifnet *ifp);
+void	mac_bpfdesc_create(struct ucred *cred, struct bpf_d *d);
+void	mac_bpfdesc_create_mbuf(struct bpf_d *d, struct mbuf *m);
 void	mac_bpfdesc_destroy(struct bpf_d *);
-void	mac_cred_destroy(struct ucred *);
-void	mac_devfs_destroy(struct devfs_dirent *);
-void	mac_ifnet_destroy(struct ifnet *);
-void	mac_inpcb_destroy(struct inpcb *);
-void	mac_sysvmsg_destroy(struct msg *);
-void	mac_sysvmsq_destroy(struct msqid_kernel *);
-void	mac_sysvsem_destroy(struct semid_kernel *);
-void	mac_sysvshm_destroy(struct shmid_kernel *);
-void	mac_ipq_destroy(struct ipq *);
-void	mac_socket_destroy(struct socket *);
-void	mac_pipe_destroy(struct pipepair *);
-void	mac_posixsem_destroy(struct ksem *);
-void	mac_proc_destroy(struct proc *);
-void	mac_mbuf_tag_destroy(struct m_tag *);
-void	mac_mount_destroy(struct mount *);
-void	mac_vnode_destroy(struct vnode *);
+void	mac_bpfdesc_init(struct bpf_d *);
 
-struct label	*mac_cred_label_alloc(void);
-void		 mac_cred_label_free(struct label *);
-struct label	*mac_vnode_label_alloc(void);
-void		 mac_vnode_label_free(struct label *);
+int	mac_cred_check_visible(struct ucred *cr1, struct ucred *cr2);
+void	mac_cred_copy(struct ucred *cr1, struct ucred *cr2);
+void	mac_cred_destroy(struct ucred *);
+void	mac_cred_init(struct ucred *);
 
-/*
- * Labeling event operations: file system objects, and things that look a lot
- * like file system objects.
- */
-void	mac_devfs_vnode_associate(struct mount *mp, struct devfs_dirent *de,
-	    struct vnode *vp);
-int	mac_vnode_associate_extattr(struct mount *mp, struct vnode *vp);
-void	mac_vnode_associate_singlelabel(struct mount *mp, struct vnode *vp);
 void	mac_devfs_create_device(struct ucred *cred, struct mount *mp,
 	    struct cdev *dev, struct devfs_dirent *de);
 void	mac_devfs_create_directory(struct mount *mp, char *dirname,
 	    int dirnamelen, struct devfs_dirent *de);
 void	mac_devfs_create_symlink(struct ucred *cred, struct mount *mp,
 	    struct devfs_dirent *dd, struct devfs_dirent *de);
-int	mac_vnode_create_extattr(struct ucred *cred, struct mount *mp,
-	    struct vnode *dvp, struct vnode *vp, struct componentname *cnp);
-void	mac_mount_create(struct ucred *cred, struct mount *mp);
-void	mac_vnode_relabel(struct ucred *cred, struct vnode *vp,
-	    struct label *newlabel);
+void	mac_devfs_destroy(struct devfs_dirent *);
+void	mac_devfs_init(struct devfs_dirent *);
 void	mac_devfs_update(struct mount *mp, struct devfs_dirent *de,
 	    struct vnode *vp);
+void	mac_devfs_vnode_associate(struct mount *mp, struct devfs_dirent *de,
+	    struct vnode *vp);
 
-/*
- * Labeling event operations: IPC objects.
- */
-void	mac_socket_create_mbuf(struct socket *so, struct mbuf *m);
-void	mac_socket_create(struct ucred *cred, struct socket *so);
-void	mac_socket_newconn(struct socket *oldso, struct socket *newso);
-void	mac_socketpeer_set_from_mbuf(struct mbuf *m, struct socket *so);
-void	mac_socketpeer_set_from_socket(struct socket *oldso,
-	    struct socket *newso);
-void	mac_pipe_create(struct ucred *cred, struct pipepair *pp);
-
-/*
- * Labeling event operations: System V IPC primitives
- */
-void	mac_sysvmsg_create(struct ucred *cred, struct msqid_kernel *msqkptr,
-	    struct msg *msgptr);
-void	mac_sysvmsq_create(struct ucred *cred, struct msqid_kernel *msqkptr);
-void	mac_sysvsem_create(struct ucred *cred,
-	    struct semid_kernel *semakptr);
-void	mac_sysvshm_create(struct ucred *cred,
-	    struct shmid_kernel *shmsegptr);
-
-/*
- * Labeling event operations: POSIX (global/inter-process) semaphores.
- */
-void 	mac_posixsem_create(struct ucred *cred, struct ksem *ks);
-
-/*
- * Labeling event operations: network objects.
- */
-void	mac_bpfdesc_create(struct ucred *cred, struct bpf_d *d);
+int	mac_ifnet_check_transmit(struct ifnet *ifp, struct mbuf *m);
 void	mac_ifnet_create(struct ifnet *ifp);
+void	mac_ifnet_create_mbuf(struct ifnet *ifp, struct mbuf *m);
+void	mac_ifnet_destroy(struct ifnet *);
+void	mac_ifnet_init(struct ifnet *);
+int	mac_ifnet_ioctl_get(struct ucred *cred, struct ifreq *ifr,
+	    struct ifnet *ifp);
+int	mac_ifnet_ioctl_set(struct ucred *cred, struct ifreq *ifr,
+	    struct ifnet *ifp);
+
+int	mac_inpcb_check_deliver(struct inpcb *inp, struct mbuf *m);
 void	mac_inpcb_create(struct socket *so, struct inpcb *inp);
-void	mac_ipq_create(struct mbuf *m, struct ipq *ipq);
-void	mac_ipq_reassemble(struct ipq *ipq, struct mbuf *m);
-void	mac_netinet_fragment(struct mbuf *m, struct mbuf *frag);
 void	mac_inpcb_create_mbuf(struct inpcb *inp, struct mbuf *m);
-void	mac_create_mbuf_linklayer(struct ifnet *ifp, struct mbuf *m);
-void	mac_bpfdesc_create_mbuf(struct bpf_d *d, struct mbuf *m);
-void	mac_ifnet_create_mbuf(struct ifnet *ifp, struct mbuf *m);
-void	mac_mbuf_create_multicast_encap(struct mbuf *m, struct ifnet *ifp,
-	    struct mbuf *mnew);
-void	mac_mbuf_create_netlayer(struct mbuf *m, struct mbuf *mnew);
-int	mac_ipq_match(struct mbuf *m, struct ipq *ipq);
-void	mac_netinet_icmp_reply(struct mbuf *m);
-void	mac_netinet_tcp_reply(struct mbuf *m);
-void	mac_ipq_update(struct mbuf *m, struct ipq *ipq);
+void	mac_inpcb_destroy(struct inpcb *);
+int	mac_inpcb_init(struct inpcb *, int);
 void	mac_inpcb_sosetlabel(struct socket *so, struct inpcb *inp);
-void	mac_mbuf_create_from_firewall(struct mbuf *m);
-void	mac_syncache_destroy(struct label **l);
-int	mac_syncache_init(struct label **l);
-void	mac_syncache_create(struct label *l, struct inpcb *inp);
-void	mac_syncache_create_mbuf(struct label *l, struct mbuf *m);
 
-/*
- * Labeling event operations: processes.
- */
-void	mac_cred_copy(struct ucred *cr1, struct ucred *cr2);
-int	mac_execve_enter(struct image_params *imgp, struct mac *mac_p);
-void	mac_execve_exit(struct image_params *imgp);
-void	mac_vnode_execve_transition(struct ucred *oldcred,
-	    struct ucred *newcred, struct vnode *vp,
-	    struct label *interpvplabel, struct image_params *imgp);
-int	mac_vnode_execve_will_transition(struct ucred *cred,
-	    struct vnode *vp, struct label *interpvplabel,
-	    struct image_params *imgp);
-void	mac_proc_create_swapper(struct ucred *cred);
-void	mac_proc_create_init(struct ucred *cred);
-void	mac_proc_associate_nfsd(struct ucred *cred);
-void	mac_thread_userret(struct thread *td);
-
-/*
- * Label cleanup operation: This is the inverse complement for the mac_create
- * and associate type of hooks. This hook lets the policy module(s) perform a
- * cleanup/flushing operation on the label associated with the objects,
- * without freeing up the space allocated.  This hook is useful in cases
- * where it is desirable to remove any labeling reference when recycling any
- * object to a pool. This hook does not replace the mac_destroy hooks.
- *
- * XXXRW: These object methods are inconsistent with the life cycles of other
- * objects, and likely should be revised to be more consistent.
- */
-void	mac_sysvmsg_cleanup(struct msg *msgptr);
-void	mac_sysvmsq_cleanup(struct msqid_kernel *msqkptr);
-void	mac_sysvsem_cleanup(struct semid_kernel *semakptr);
-void	mac_sysvshm_cleanup(struct shmid_kernel *shmsegptr);
+void	mac_ipq_create(struct mbuf *m, struct ipq *ipq);
+void	mac_ipq_destroy(struct ipq *);
+int	mac_ipq_init(struct ipq *, int);
+int	mac_ipq_match(struct mbuf *m, struct ipq *ipq);
+void	mac_ipq_reassemble(struct ipq *ipq, struct mbuf *m);
+void	mac_ipq_update(struct mbuf *m, struct ipq *ipq);
 
-/*
- * Access control checks.
- */
-int	mac_bpfdesc_check_receive(struct bpf_d *d, struct ifnet *ifp);
-int	mac_cred_check_visible(struct ucred *cr1, struct ucred *cr2);
-int	mac_ifnet_check_transmit(struct ifnet *ifp, struct mbuf *m);
-int	mac_inpcb_check_deliver(struct inpcb *inp, struct mbuf *m);
-int	mac_sysvmsq_check_msgmsq(struct ucred *cred, struct msg *msgptr,
-	    struct msqid_kernel *msqkptr);
-int	mac_sysvmsq_check_msgrcv(struct ucred *cred, struct msg *msgptr);
-int	mac_sysvmsq_check_msgrmid(struct ucred *cred, struct msg *msgptr);
-int	mac_sysvmsq_check_msqget(struct ucred *cred,
-	    struct msqid_kernel *msqkptr);
-int	mac_sysvmsq_check_msqsnd(struct ucred *cred,
-	    struct msqid_kernel *msqkptr);
-int	mac_sysvmsq_check_msqrcv(struct ucred *cred,
-	    struct msqid_kernel *msqkptr);
-int	mac_sysvmsq_check_msqctl(struct ucred *cred,
-	    struct msqid_kernel *msqkptr, int cmd);
-int	mac_sysvsem_check_semctl(struct ucred *cred,
-	    struct semid_kernel *semakptr, int cmd);
-int	mac_sysvsem_check_semget(struct ucred *cred,
-	   struct semid_kernel *semakptr);
-int	mac_sysvsem_check_semop(struct ucred *cred,
-	    struct semid_kernel *semakptr, size_t accesstype);
-int	mac_sysvshm_check_shmat(struct ucred *cred,
-	    struct shmid_kernel *shmsegptr, int shmflg);
-int	mac_sysvshm_check_shmctl(struct ucred *cred,
-	    struct shmid_kernel *shmsegptr, int cmd);
-int	mac_sysvshm_check_shmdt(struct ucred *cred,
-	    struct shmid_kernel *shmsegptr);
-int	mac_sysvshm_check_shmget(struct ucred *cred,
-	    struct shmid_kernel *shmsegptr, int shmflg);
 int	mac_kenv_check_dump(struct ucred *cred);
 int	mac_kenv_check_get(struct ucred *cred, char *name);
 int	mac_kenv_check_set(struct ucred *cred, char *name, char *value);
 int	mac_kenv_check_unset(struct ucred *cred, char *name);
+
 int	mac_kld_check_load(struct ucred *cred, struct vnode *vp);
 int	mac_kld_check_stat(struct ucred *cred);
+
+void	mac_mbuf_copy(struct mbuf *, struct mbuf *);
+void	mac_mbuf_create_from_firewall(struct mbuf *m);
+void	mac_create_mbuf_linklayer(struct ifnet *ifp, struct mbuf *m);
+void	mac_mbuf_create_multicast_encap(struct mbuf *m, struct ifnet *ifp,
+	    struct mbuf *mnew);
+void	mac_mbuf_create_netlayer(struct mbuf *m, struct mbuf *mnew);
+int	mac_mbuf_init(struct mbuf *, int);
+
+void	mac_mbuf_tag_copy(struct m_tag *, struct m_tag *);
+void	mac_mbuf_tag_destroy(struct m_tag *);
+int	mac_mbuf_tag_init(struct m_tag *, int);
+
 int	mac_mount_check_stat(struct ucred *cred, struct mount *mp);
+void	mac_mount_create(struct ucred *cred, struct mount *mp);
+void	mac_mount_destroy(struct mount *);
+void	mac_mount_init(struct mount *);
+
+void	mac_netinet_fragment(struct mbuf *m, struct mbuf *frag);
+void	mac_netinet_icmp_reply(struct mbuf *m);
+void	mac_netinet_tcp_reply(struct mbuf *m);
+
 int	mac_pipe_check_ioctl(struct ucred *cred, struct pipepair *pp,
 	    unsigned long cmd, void *data);
 int	mac_pipe_check_poll(struct ucred *cred, struct pipepair *pp);
 int	mac_pipe_check_read(struct ucred *cred, struct pipepair *pp);
 int	mac_pipe_check_stat(struct ucred *cred, struct pipepair *pp);
 int	mac_pipe_check_write(struct ucred *cred, struct pipepair *pp);
+void	mac_pipe_create(struct ucred *cred, struct pipepair *pp);
+void	mac_pipe_destroy(struct pipepair *);
+void	mac_pipe_init(struct pipepair *);
+int	mac_pipe_label_set(struct ucred *cred, struct pipepair *pp,
+	    struct label *label);
+
 int	mac_posixsem_check_destroy(struct ucred *cred, struct ksem *ks);
 int	mac_posixsem_check_getvalue(struct ucred *cred,struct ksem *ks);
 int	mac_posixsem_check_open(struct ucred *cred, struct ksem *ks);
 int	mac_posixsem_check_post(struct ucred *cred, struct ksem *ks);
 int	mac_posixsem_check_unlink(struct ucred *cred, struct ksem *ks);
 int	mac_posixsem_check_wait(struct ucred *cred, struct ksem *ks);
+void 	mac_posixsem_create(struct ucred *cred, struct ksem *ks);
+void	mac_posixsem_destroy(struct ksem *);
+void	mac_posixsem_init(struct ksem *);
+
+int	mac_priv_check(struct ucred *cred, int priv);
+int	mac_priv_grant(struct ucred *cred, int priv);
+
+void	mac_proc_associate_nfsd(struct ucred *cred);
 int	mac_proc_check_debug(struct ucred *cred, struct proc *p);
 int	mac_proc_check_sched(struct ucred *cred, struct proc *p);
 int	mac_proc_check_setaudit(struct ucred *cred, struct auditinfo *ai);
 int	mac_proc_check_setaudit_addr(struct ucred *cred,
 	    struct auditinfo_addr *aia);
 int	mac_proc_check_setauid(struct ucred *cred, uid_t auid);
-int	mac_proc_check_setuid(struct proc *p,  struct ucred *cred,
-	    uid_t uid);
+int	mac_proc_check_setegid(struct proc *p, struct ucred *cred,
+	    gid_t egid);
 int	mac_proc_check_seteuid(struct proc *p, struct ucred *cred,
 	    uid_t euid);
 int	mac_proc_check_setgid(struct proc *p, struct ucred *cred,
 	    gid_t gid);
-int	mac_proc_check_setegid(struct proc *p, struct ucred *cred,
-	    gid_t egid);
 int	mac_proc_check_setgroups(struct proc *p, struct ucred *cred,
 	    int ngroups, gid_t *gidset);
-int	mac_proc_check_setreuid(struct proc *p, struct ucred *cred,
-	    uid_t ruid, uid_t euid);
 int	mac_proc_check_setregid(struct proc *p, struct ucred *cred,
 	    gid_t rgid, gid_t egid);
-int	mac_proc_check_setresuid(struct proc *p, struct ucred *cred,
-	    uid_t ruid, uid_t euid, uid_t suid);
 int	mac_proc_check_setresgid(struct proc *p, struct ucred *cred,
 	    gid_t rgid, gid_t egid, gid_t sgid);
+int	mac_proc_check_setresuid(struct proc *p, struct ucred *cred,
+	    uid_t ruid, uid_t euid, uid_t suid);
+int	mac_proc_check_setreuid(struct proc *p, struct ucred *cred,
+	    uid_t ruid, uid_t euid);
+int	mac_proc_check_setuid(struct proc *p,  struct ucred *cred,
+	    uid_t uid);
 int	mac_proc_check_signal(struct ucred *cred, struct proc *p,
 	    int signum);
 int	mac_proc_check_wait(struct ucred *cred, struct proc *p);
+void	mac_proc_create_init(struct ucred *cred);
+void	mac_proc_create_swapper(struct ucred *cred);
+void	mac_proc_destroy(struct proc *);
+int	mac_execve_enter(struct image_params *imgp, struct mac *mac_p);
+void	mac_execve_exit(struct image_params *imgp);
+void	mac_proc_init(struct proc *);
+
 int	mac_socket_check_accept(struct ucred *cred, struct socket *so);
 int	mac_socket_check_bind(struct ucred *cred, struct socket *so,
 	    struct sockaddr *sa);
@@ -336,6 +241,27 @@ int	mac_socket_check_receive(struct ucred *cred, struct socket *so);
 int	mac_socket_check_send(struct ucred *cred, struct socket *so);
 int	mac_socket_check_stat(struct ucred *cred, struct socket *so);
 int	mac_socket_check_visible(struct ucred *cred, struct socket *so);
+void	mac_socket_create_mbuf(struct socket *so, struct mbuf *m);
+void	mac_socket_create(struct ucred *cred, struct socket *so);
+void	mac_socket_destroy(struct socket *);
+int	mac_socket_init(struct socket *, int);
+void	mac_socket_newconn(struct socket *oldso, struct socket *newso);
+int	mac_getsockopt_label(struct ucred *cred, struct socket *so,
+	    struct mac *extmac);
+int	mac_getsockopt_peerlabel(struct ucred *cred, struct socket *so,
+	    struct mac *extmac);
+int	mac_setsockopt_label(struct ucred *cred, struct socket *so,
+	    struct mac *extmac);
+
+void	mac_socketpeer_set_from_mbuf(struct mbuf *m, struct socket *so);
+void	mac_socketpeer_set_from_socket(struct socket *oldso,
+	    struct socket *newso);
+
+void	mac_syncache_create(struct label *l, struct inpcb *inp);
+void	mac_syncache_create_mbuf(struct label *l, struct mbuf *m);
+void	mac_syncache_destroy(struct label **l);
+int	mac_syncache_init(struct label **l);
+
 int	mac_system_check_acct(struct ucred *cred, struct vnode *vp);
 int	mac_system_check_audit(struct ucred *cred, void *record, int length);
 int	mac_system_check_auditctl(struct ucred *cred, struct vnode *vp);
@@ -345,6 +271,60 @@ int	mac_system_check_swapon(struct ucred *cred, struct vnode *vp);
 int	mac_system_check_swapoff(struct ucred *cred, struct vnode *vp);
 int	mac_system_check_sysctl(struct ucred *cred, struct sysctl_oid *oidp,
 	    void *arg1, int arg2, struct sysctl_req *req);
+
+void	mac_sysvmsg_cleanup(struct msg *msgptr);
+void	mac_sysvmsg_create(struct ucred *cred, struct msqid_kernel *msqkptr,
+	    struct msg *msgptr);
+void	mac_sysvmsg_destroy(struct msg *);
+void	mac_sysvmsg_init(struct msg *);
+
+int	mac_sysvmsq_check_msgmsq(struct ucred *cred, struct msg *msgptr,
+	    struct msqid_kernel *msqkptr);
+int	mac_sysvmsq_check_msgrcv(struct ucred *cred, struct msg *msgptr);
+int	mac_sysvmsq_check_msgrmid(struct ucred *cred, struct msg *msgptr);
+int	mac_sysvmsq_check_msqctl(struct ucred *cred,
+	    struct msqid_kernel *msqkptr, int cmd);
+int	mac_sysvmsq_check_msqget(struct ucred *cred,
+	    struct msqid_kernel *msqkptr);
+int	mac_sysvmsq_check_msqrcv(struct ucred *cred,
+	    struct msqid_kernel *msqkptr);
+int	mac_sysvmsq_check_msqsnd(struct ucred *cred,
+	    struct msqid_kernel *msqkptr);
+void	mac_sysvmsq_cleanup(struct msqid_kernel *msqkptr);
+void	mac_sysvmsq_create(struct ucred *cred, struct msqid_kernel *msqkptr);
+void	mac_sysvmsq_destroy(struct msqid_kernel *);
+void	mac_sysvmsq_init(struct msqid_kernel *);
+
+int	mac_sysvsem_check_semctl(struct ucred *cred,
+	    struct semid_kernel *semakptr, int cmd);
+int	mac_sysvsem_check_semget(struct ucred *cred,
+	   struct semid_kernel *semakptr);
+int	mac_sysvsem_check_semop(struct ucred *cred,
+	    struct semid_kernel *semakptr, size_t accesstype);
+void	mac_sysvsem_cleanup(struct semid_kernel *semakptr);
+void	mac_sysvsem_create(struct ucred *cred,
+	    struct semid_kernel *semakptr);
+void	mac_sysvsem_destroy(struct semid_kernel *);
+void	mac_sysvsem_init(struct semid_kernel *);
+
+int	mac_sysvshm_check_shmat(struct ucred *cred,
+	    struct shmid_kernel *shmsegptr, int shmflg);
+int	mac_sysvshm_check_shmctl(struct ucred *cred,
+	    struct shmid_kernel *shmsegptr, int cmd);
+int	mac_sysvshm_check_shmdt(struct ucred *cred,
+	    struct shmid_kernel *shmsegptr);
+int	mac_sysvshm_check_shmget(struct ucred *cred,
+	    struct shmid_kernel *shmsegptr, int shmflg);
+void	mac_sysvshm_cleanup(struct shmid_kernel *shmsegptr);
+void	mac_sysvshm_create(struct ucred *cred,
+	    struct shmid_kernel *shmsegptr);
+void	mac_sysvshm_destroy(struct shmid_kernel *);
+void	mac_sysvshm_init(struct shmid_kernel *);
+
+void	mac_thread_userret(struct thread *td);
+
+int	mac_vnode_associate_extattr(struct mount *mp, struct vnode *vp);
+void	mac_vnode_associate_singlelabel(struct mount *mp, struct vnode *vp);
 int	mac_vnode_check_access(struct ucred *cred, struct vnode *vp,
 	    int acc_mode);
 int	mac_vnode_check_chdir(struct ucred *cred, struct vnode *dvp);
@@ -402,21 +382,26 @@ int	mac_vnode_check_unlink(struct ucred *cred, struct vnode *dvp,
 	    struct vnode *vp, struct componentname *cnp);
 int	mac_vnode_check_write(struct ucred *active_cred,
 	    struct ucred *file_cred, struct vnode *vp);
-int	mac_getsockopt_label(struct ucred *cred, struct socket *so,
-	    struct mac *extmac);
-int	mac_getsockopt_peerlabel(struct ucred *cred, struct socket *so,
-	    struct mac *extmac);
-int	mac_ifnet_ioctl_get(struct ucred *cred, struct ifreq *ifr,
-	    struct ifnet *ifp);
-int	mac_ifnet_ioctl_set(struct ucred *cred, struct ifreq *ifr,
-	    struct ifnet *ifp);
-int	mac_setsockopt_label(struct ucred *cred, struct socket *so,
-	    struct mac *extmac);
-int	mac_pipe_label_set(struct ucred *cred, struct pipepair *pp,
-	    struct label *label);
+void	mac_vnode_copy_label(struct label *, struct label *);
+void	mac_vnode_init(struct vnode *);
+int	mac_vnode_create_extattr(struct ucred *cred, struct mount *mp,
+	    struct vnode *dvp, struct vnode *vp, struct componentname *cnp);
+void	mac_vnode_destroy(struct vnode *);
+void	mac_vnode_execve_transition(struct ucred *oldcred,
+	    struct ucred *newcred, struct vnode *vp,
+	    struct label *interpvplabel, struct image_params *imgp);
+int	mac_vnode_execve_will_transition(struct ucred *cred,
+	    struct vnode *vp, struct label *interpvplabel,
+	    struct image_params *imgp);
+void	mac_vnode_relabel(struct ucred *cred, struct vnode *vp,
+	    struct label *newlabel);
+
+struct label	*mac_cred_label_alloc(void);
+void		 mac_cred_label_free(struct label *);
+struct label	*mac_vnode_label_alloc(void);
+void		 mac_vnode_label_free(struct label *);
+
 void	mac_cred_mmapped_drop_perms(struct thread *td, struct ucred *cred);
-int	mac_priv_check(struct ucred *cred, int priv);
-int	mac_priv_grant(struct ucred *cred, int priv);
 
 /*
  * Calls to help various file systems implement labeling functionality using