Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 6 Jul 2006 09:05:13 GMT
From:      Robert Watson <rwatson@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 100705 for review
Message-ID:  <200607060905.k6695D1M055102@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=100705

Change 100705 by rwatson@rwatson_zoo on 2006/07/06 09:04:45

	Make mac.h the user space API, and mac_framework.h the kernel API.

Affected files ...

.. //depot/projects/trustedbsd/mac2/sys/sys/mac.h#2 edit
.. //depot/projects/trustedbsd/mac2/sys/sys/mac_framework.h#2 edit

Differences ...

==== //depot/projects/trustedbsd/mac2/sys/sys/mac.h#2 (text+ko) ====

@@ -1,7 +1,7 @@
 /*-
  * Copyright (c) 1999-2002 Robert N. M. Watson
  * Copyright (c) 2001-2005 Networks Associates Technology, Inc.
- * Copyright (c) 2005 SPARTA, Inc.
+ * Copyright (c) 2005-2006 SPARTA, Inc.
  * All rights reserved.
  *
  * This software was developed by Robert Watson for the TrustedBSD Project.
@@ -38,7 +38,7 @@
  * $FreeBSD: src/sys/sys/mac.h,v 1.70 2006/04/06 23:33:11 csjp Exp $
  */
 /*
- * Userland/kernel interface for Mandatory Access Control.
+ * Userland interface for Mandatory Access Control.
  *
  * The POSIX.1e implementation page may be reached at:
  * http://www.trustedbsd.org/
@@ -68,8 +68,6 @@
 
 typedef struct mac	*mac_t;
 
-#ifndef _KERNEL
-
 /*
  * Location of the userland MAC framework configuration file.  mac.conf
  * binds policy names to shared libraries that understand those policies,
@@ -105,372 +103,4 @@
 int	 mac_to_text(mac_t mac, char **_text);
 __END_DECLS
 
-#else /* _KERNEL */
-
-/*
- * Kernel functions to manage and evaluate labels.
- */
-struct bpf_d;
-struct cdev;
-struct componentname;
-struct devfs_dirent;
-struct ifnet;
-struct ifreq;
-struct inpcb;
-struct image_params;
-struct inpcb;
-struct ipq;
-struct ksem;
-struct m_tag;
-struct mbuf;
-struct mount;
-struct msg;
-struct msqid_kernel;
-struct proc;
-struct semid_kernel;
-struct shmid_kernel;
-struct sockaddr;
-struct socket;
-struct sysctl_oid;
-struct sysctl_req;
-struct pipepair;
-struct thread;
-struct timespec;
-struct ucred;
-struct uio;
-struct vattr;
-struct vnode;
-
-#include <sys/acl.h>			/* XXX acl_type_t */
-
-struct vop_setlabel_args;
-
-/*
- * Label operations.
- */
-void	mac_init_bpfdesc(struct bpf_d *);
-void	mac_init_cred(struct ucred *);
-void	mac_init_devfsdirent(struct devfs_dirent *);
-void	mac_init_ifnet(struct ifnet *);
-int	mac_init_inpcb(struct inpcb *, int flag);
-void	mac_init_sysv_msgmsg(struct msg *);
-void	mac_init_sysv_msgqueue(struct msqid_kernel*);
-void	mac_init_sysv_sem(struct semid_kernel*);
-void	mac_init_sysv_shm(struct shmid_kernel*);
-int	mac_init_ipq(struct ipq *, int flag);
-int	mac_init_socket(struct socket *, int flag);
-void	mac_init_pipe(struct pipepair *);
-void	mac_init_posix_sem(struct ksem *);
-int	mac_init_mbuf(struct mbuf *mbuf, int flag);
-int	mac_init_mbuf_tag(struct m_tag *, int flag);
-void	mac_init_mount(struct mount *);
-void	mac_init_proc(struct proc *);
-void	mac_init_vnode(struct vnode *);
-void	mac_copy_mbuf(struct mbuf *m_from, struct mbuf *m_to);
-void	mac_copy_mbuf_tag(struct m_tag *, struct m_tag *);
-void	mac_copy_vnode_label(struct label *, struct label *label);
-void	mac_destroy_bpfdesc(struct bpf_d *);
-void	mac_destroy_cred(struct ucred *);
-void	mac_destroy_devfsdirent(struct devfs_dirent *);
-void	mac_destroy_ifnet(struct ifnet *);
-void	mac_destroy_inpcb(struct inpcb *);
-void	mac_destroy_sysv_msgmsg(struct msg *);
-void	mac_destroy_sysv_msgqueue(struct msqid_kernel *);
-void	mac_destroy_sysv_sem(struct semid_kernel *);
-void	mac_destroy_sysv_shm(struct shmid_kernel *);
-void	mac_destroy_ipq(struct ipq *);
-void	mac_destroy_socket(struct socket *);
-void	mac_destroy_pipe(struct pipepair *);
-void	mac_destroy_posix_sem(struct ksem *);
-void	mac_destroy_proc(struct proc *);
-void	mac_destroy_mbuf_tag(struct m_tag *);
-void	mac_destroy_mount(struct mount *);
-void	mac_destroy_vnode(struct vnode *);
-
-struct label	*mac_cred_label_alloc(void);
-void		 mac_cred_label_free(struct label *label);
-struct label	*mac_vnode_label_alloc(void);
-void		 mac_vnode_label_free(struct label *label);
-
-/*
- * Labeling event operations: file system objects, and things that
- * look a lot like file system objects.
- */
-void	mac_associate_vnode_devfs(struct mount *mp, struct devfs_dirent *de,
-	    struct vnode *vp);
-int	mac_associate_vnode_extattr(struct mount *mp, struct vnode *vp);
-void	mac_associate_vnode_singlelabel(struct mount *mp, struct vnode *vp);
-void	mac_create_devfs_device(struct ucred *cred, struct mount *mp,
-	    struct cdev *dev, struct devfs_dirent *de);
-void	mac_create_devfs_directory(struct mount *mp, char *dirname,
-	    int dirnamelen, struct devfs_dirent *de);
-void	mac_create_devfs_symlink(struct ucred *cred, struct mount *mp,
-	    struct devfs_dirent *dd, struct devfs_dirent *de);
-int	mac_create_vnode_extattr(struct ucred *cred, struct mount *mp,
-	    struct vnode *dvp, struct vnode *vp, struct componentname *cnp);
-void	mac_create_mount(struct ucred *cred, struct mount *mp);
-void	mac_relabel_vnode(struct ucred *cred, struct vnode *vp,
-	    struct label *newlabel);
-void	mac_update_devfsdirent(struct mount *mp, struct devfs_dirent *de,
-	    struct vnode *vp);
-
-/*
- * Labeling event operations: IPC objects.
- */
-void	mac_create_mbuf_from_socket(struct socket *so, struct mbuf *m);
-void	mac_create_socket(struct ucred *cred, struct socket *socket);
-void	mac_create_socket_from_socket(struct socket *oldsocket,
-	    struct socket *newsocket);
-void	mac_set_socket_peer_from_mbuf(struct mbuf *mbuf,
-	    struct socket *socket);
-void	mac_set_socket_peer_from_socket(struct socket *oldsocket,
-	    struct socket *newsocket);
-void	mac_create_pipe(struct ucred *cred, struct pipepair *pp);
-
-/*
- * Labeling event operations: System V IPC primitives
- */
-void	mac_create_sysv_msgmsg(struct ucred *cred,
-	    struct msqid_kernel *msqkptr, struct msg *msgptr);
-void	mac_create_sysv_msgqueue(struct ucred *cred,
-	    struct msqid_kernel *msqkptr);
-void	mac_create_sysv_sem(struct ucred *cred,
-	    struct semid_kernel *semakptr);
-void	mac_create_sysv_shm(struct ucred *cred,
-	    struct shmid_kernel *shmsegptr);
-
-/*
- * Labeling event operations: POSIX (global/inter-process) semaphores.
- */
-void 	mac_create_posix_sem(struct ucred *cred, struct ksem *ksemptr);
-
-
-/*
- * Labeling event operations: network objects.
- */
-void	mac_create_bpfdesc(struct ucred *cred, struct bpf_d *bpf_d);
-void	mac_create_ifnet(struct ifnet *ifp);
-void	mac_create_inpcb_from_socket(struct socket *so, struct inpcb *inp);
-void	mac_create_ipq(struct mbuf *fragment, struct ipq *ipq);
-void	mac_create_datagram_from_ipq(struct ipq *ipq, struct mbuf *datagram);
-void	mac_create_fragment(struct mbuf *datagram, struct mbuf *fragment);
-void	mac_create_mbuf_from_inpcb(struct inpcb *inp, struct mbuf *m);
-void	mac_create_mbuf_linklayer(struct ifnet *ifnet, struct mbuf *m);
-void	mac_create_mbuf_from_bpfdesc(struct bpf_d *bpf_d, struct mbuf *m);
-void	mac_create_mbuf_from_ifnet(struct ifnet *ifnet, struct mbuf *m);
-void	mac_create_mbuf_multicast_encap(struct mbuf *oldmbuf,
-	    struct ifnet *ifnet, struct mbuf *newmbuf);
-void	mac_create_mbuf_netlayer(struct mbuf *oldmbuf, struct mbuf *newmbuf);
-int	mac_fragment_match(struct mbuf *fragment, struct ipq *ipq);
-void	mac_reflect_mbuf_icmp(struct mbuf *m);
-void	mac_reflect_mbuf_tcp(struct mbuf *m);
-void	mac_update_ipq(struct mbuf *fragment, struct ipq *ipq);
-void	mac_inpcb_sosetlabel(struct socket *so, struct inpcb *inp);
-
-/*
- * Labeling event operations: processes.
- */
-void	mac_copy_cred(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_execve_transition(struct ucred *old, struct ucred *new,
-	    struct vnode *vp, struct label *interpvnodelabel,
-	    struct image_params *imgp);
-int	mac_execve_will_transition(struct ucred *old, struct vnode *vp,
-	    struct label *interpvnodelabel, struct image_params *imgp);
-void	mac_create_proc0(struct ucred *cred);
-void	mac_create_proc1(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.
- */
-void	mac_cleanup_sysv_msgmsg(struct msg *msgptr);
-void	mac_cleanup_sysv_msgqueue(struct msqid_kernel *msqkptr);
-void	mac_cleanup_sysv_sem(struct semid_kernel *semakptr);
-void	mac_cleanup_sysv_shm(struct shmid_kernel *shmsegptr);
-
-/* Access control checks. */
-int	mac_check_bpfdesc_receive(struct bpf_d *bpf_d, struct ifnet *ifnet);
-int	mac_check_cred_visible(struct ucred *u1, struct ucred *u2);
-int	mac_check_ifnet_transmit(struct ifnet *ifnet, struct mbuf *m);
-int	mac_check_inpcb_deliver(struct inpcb *inp, struct mbuf *m);
-int	mac_check_sysv_msgmsq(struct ucred *cred, struct msg *msgptr,
-	    struct msqid_kernel *msqkptr);
-int	mac_check_sysv_msgrcv(struct ucred *cred, struct msg *msgptr);
-int	mac_check_sysv_msgrmid(struct ucred *cred, struct msg *msgptr);
-int	mac_check_sysv_msqget(struct ucred *cred,
-	    struct msqid_kernel *msqkptr);
-int	mac_check_sysv_msqsnd(struct ucred *cred,
-	    struct msqid_kernel *msqkptr);
-int	mac_check_sysv_msqrcv(struct ucred *cred,
-	    struct msqid_kernel *msqkptr);
-int	mac_check_sysv_msqctl(struct ucred *cred,
-	    struct msqid_kernel *msqkptr, int cmd);
-int	mac_check_sysv_semctl(struct ucred *cred,
-	    struct semid_kernel *semakptr, int cmd);
-int	mac_check_sysv_semget(struct ucred *cred,
-	   struct semid_kernel *semakptr);
-int	mac_check_sysv_semop(struct ucred *cred,struct semid_kernel *semakptr,
-	    size_t accesstype);
-int	mac_check_sysv_shmat(struct ucred *cred,
-	    struct shmid_kernel *shmsegptr, int shmflg);
-int	mac_check_sysv_shmctl(struct ucred *cred,
-	    struct shmid_kernel *shmsegptr, int cmd);
-int	mac_check_sysv_shmdt(struct ucred *cred,
-	    struct shmid_kernel *shmsegptr);
-int	mac_check_sysv_shmget(struct ucred *cred,
-	    struct shmid_kernel *shmsegptr, int shmflg);
-int	mac_check_kenv_dump(struct ucred *cred);
-int	mac_check_kenv_get(struct ucred *cred, char *name);
-int	mac_check_kenv_set(struct ucred *cred, char *name, char *value);
-int	mac_check_kenv_unset(struct ucred *cred, char *name);
-int	mac_check_kld_load(struct ucred *cred, struct vnode *vp);
-int	mac_check_kld_stat(struct ucred *cred);
-int	mac_check_kld_unload(struct ucred *cred);
-int	mac_check_mount_stat(struct ucred *cred, struct mount *mp);
-int	mac_check_pipe_ioctl(struct ucred *cred, struct pipepair *pp,
-	    unsigned long cmd, void *data);
-int	mac_check_pipe_poll(struct ucred *cred, struct pipepair *pp);
-int	mac_check_pipe_read(struct ucred *cred, struct pipepair *pp);
-int	mac_check_pipe_stat(struct ucred *cred, struct pipepair *pp);
-int	mac_check_pipe_write(struct ucred *cred, struct pipepair *pp);
-int	mac_check_posix_sem_destroy(struct ucred *cred, struct ksem *ksemptr);
-int	mac_check_posix_sem_getvalue(struct ucred *cred,struct ksem *ksemptr);
-int	mac_check_posix_sem_open(struct ucred *cred, struct ksem *ksemptr);
-int	mac_check_posix_sem_post(struct ucred *cred, struct ksem *ksemptr);
-int	mac_check_posix_sem_unlink(struct ucred *cred, struct ksem *ksemptr);
-int	mac_check_posix_sem_wait(struct ucred *cred, struct ksem *ksemptr);
-int	mac_check_proc_debug(struct ucred *cred, struct proc *proc);
-int	mac_check_proc_sched(struct ucred *cred, struct proc *proc);
-int	mac_check_proc_setuid(struct proc *proc,  struct ucred *cred,
-	    uid_t uid);
-int	mac_check_proc_seteuid(struct proc *proc, struct ucred *cred,
-	    uid_t euid);
-int	mac_check_proc_setgid(struct proc *proc, struct ucred *cred,
-	    gid_t gid);
-int	mac_check_proc_setegid(struct proc *proc, struct ucred *cred,
-	    gid_t egid);
-int	mac_check_proc_setgroups(struct proc *proc, struct ucred *cred,
-	    int ngroups, gid_t *gidset);
-int	mac_check_proc_setreuid(struct proc *proc, struct ucred *cred,
-	    uid_t ruid, uid_t euid);
-int	mac_check_proc_setregid(struct proc *proc, struct ucred *cred,
-	    gid_t rgid, gid_t egid);
-int	mac_check_proc_setresuid(struct proc *proc, struct ucred *cred,
-	    uid_t ruid, uid_t euid, uid_t suid);
-int	mac_check_proc_setresgid(struct proc *proc, struct ucred *cred,
-	    gid_t rgid, gid_t egid, gid_t sgid);
-int	mac_check_proc_signal(struct ucred *cred, struct proc *proc,
-	    int signum);
-int	mac_check_proc_wait(struct ucred *cred, struct proc *proc);
-int	mac_check_socket_accept(struct ucred *cred, struct socket *so);
-int	mac_check_socket_bind(struct ucred *cred, struct socket *so,
-	    struct sockaddr *sockaddr);
-int	mac_check_socket_connect(struct ucred *cred, struct socket *so,
-	    struct sockaddr *sockaddr);
-int	mac_check_socket_create(struct ucred *cred, int domain, int type,
-	    int protocol);
-int	mac_check_socket_deliver(struct socket *so, struct mbuf *m);
-int	mac_check_socket_listen(struct ucred *cred, struct socket *so);
-int	mac_check_socket_poll(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_stat(struct ucred *cred, struct socket *so);
-int	mac_check_socket_visible(struct ucred *cred, struct socket *so);
-int	mac_check_sysarch_ioperm(struct ucred *cred);
-int	mac_check_system_acct(struct ucred *cred, struct vnode *vp);
-int	mac_check_system_nfsd(struct ucred *cred);
-int	mac_check_system_reboot(struct ucred *cred, int howto);
-int	mac_check_system_settime(struct ucred *cred);
-int	mac_check_system_swapon(struct ucred *cred, struct vnode *vp);
-int	mac_check_system_swapoff(struct ucred *cred, struct vnode *vp);
-int	mac_check_system_sysctl(struct ucred *cred, struct sysctl_oid *oidp,
-	    void *arg1, int arg2, struct sysctl_req *req);
-int	mac_check_vnode_access(struct ucred *cred, struct vnode *vp,
-	    int acc_mode);
-int	mac_check_vnode_chdir(struct ucred *cred, struct vnode *dvp);
-int	mac_check_vnode_chroot(struct ucred *cred, struct vnode *dvp);
-int	mac_check_vnode_create(struct ucred *cred, struct vnode *dvp,
-	    struct componentname *cnp, struct vattr *vap);
-int	mac_check_vnode_delete(struct ucred *cred, struct vnode *dvp,
-	    struct vnode *vp, struct componentname *cnp);
-int	mac_check_vnode_deleteacl(struct ucred *cred, struct vnode *vp,
-	    acl_type_t type);
-int	mac_check_vnode_deleteextattr(struct ucred *cred, struct vnode *vp,
-	    int attrnamespace, const char *name);
-int	mac_check_vnode_exec(struct ucred *cred, struct vnode *vp,
-	    struct image_params *imgp);
-int	mac_check_vnode_getacl(struct ucred *cred, struct vnode *vp,
-	    acl_type_t type);
-int	mac_check_vnode_getextattr(struct ucred *cred, struct vnode *vp,
-	    int attrnamespace, const char *name, struct uio *uio);
-int	mac_check_vnode_link(struct ucred *cred, struct vnode *dvp,
-	    struct vnode *vp, struct componentname *cnp);
-int	mac_check_vnode_listextattr(struct ucred *cred, struct vnode *vp,
-	    int attrnamespace);
-int	mac_check_vnode_lookup(struct ucred *cred, struct vnode *dvp,
- 	    struct componentname *cnp);
-int	mac_check_vnode_mmap(struct ucred *cred, struct vnode *vp,
-	    int prot, int flags);
-int	mac_check_vnode_mprotect(struct ucred *cred, struct vnode *vp,
-	    int prot);
-int	mac_check_vnode_open(struct ucred *cred, struct vnode *vp,
-	    int acc_mode);
-int	mac_check_vnode_poll(struct ucred *active_cred,
-	    struct ucred *file_cred, struct vnode *vp);
-int	mac_check_vnode_read(struct ucred *active_cred,
-	    struct ucred *file_cred, struct vnode *vp);
-int	mac_check_vnode_readdir(struct ucred *cred, struct vnode *vp);
-int	mac_check_vnode_readlink(struct ucred *cred, struct vnode *vp);
-int	mac_check_vnode_rename_from(struct ucred *cred, struct vnode *dvp,
-	    struct vnode *vp, struct componentname *cnp);
-int	mac_check_vnode_rename_to(struct ucred *cred, struct vnode *dvp,
-	    struct vnode *vp, int samedir, struct componentname *cnp);
-int	mac_check_vnode_revoke(struct ucred *cred, struct vnode *vp);
-int	mac_check_vnode_setacl(struct ucred *cred, struct vnode *vp,
-	    acl_type_t type, struct acl *acl);
-int	mac_check_vnode_setextattr(struct ucred *cred, struct vnode *vp,
-	    int attrnamespace, const char *name, struct uio *uio);
-int	mac_check_vnode_setflags(struct ucred *cred, struct vnode *vp,
-	    u_long flags);
-int	mac_check_vnode_setmode(struct ucred *cred, struct vnode *vp,
-	    mode_t mode);
-int	mac_check_vnode_setowner(struct ucred *cred, struct vnode *vp,
-	    uid_t uid, gid_t gid);
-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_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_ioctl_ifnet_get(struct ucred *cred, struct ifreq *ifr,
-	    struct ifnet *ifnet);
-int	mac_ioctl_ifnet_set(struct ucred *cred, struct ifreq *ifr,
-	    struct ifnet *ifnet);
-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_cred_mmapped_drop_perms(struct thread *td, struct ucred *cred);
-void	mac_associate_nfsd_label(struct ucred *cred);
-
-/*
- * Calls to help various file systems implement labeling functionality
- * using their existing EA implementation.
- */
-int	vop_stdsetlabel_ea(struct vop_setlabel_args *ap);
-
-#endif /* !_KERNEL */
-
 #endif /* !_SYS_MAC_H_ */

==== //depot/projects/trustedbsd/mac2/sys/sys/mac_framework.h#2 (text+ko) ====

@@ -1,7 +1,7 @@
 /*-
  * Copyright (c) 1999-2002 Robert N. M. Watson
  * Copyright (c) 2001-2005 Networks Associates Technology, Inc.
- * Copyright (c) 2005 SPARTA, Inc.
+ * Copyright (c) 2005-2006 SPARTA, Inc.
  * All rights reserved.
  *
  * This software was developed by Robert Watson for the TrustedBSD Project.
@@ -38,78 +38,19 @@
  * $FreeBSD: src/sys/sys/mac.h,v 1.70 2006/04/06 23:33:11 csjp Exp $
  */
 /*
- * Userland/kernel interface for Mandatory Access Control.
- *
- * The POSIX.1e implementation page may be reached at:
- * http://www.trustedbsd.org/
+ * Kernel interface for Mandatory Access Control -- how kernel services
+ * interact with the TrustedBSD MAC Framework.
  */
 
-#ifndef _SYS_MAC_H_
-#define	_SYS_MAC_H_
+#ifndef _SYS_MAC_FRAMEWORK_H_
+#define	_SYS_MAC_FRAMEWORK_H_
 
-#include <sys/_label.h>
-
-#ifndef _POSIX_MAC
-#define	_POSIX_MAC
+#ifndef _KERNEL
+#error "no user-serviceable parts inside"
 #endif
 
-/*
- * MAC framework-related constants and limits.
- */
-#define	MAC_MAX_POLICY_NAME		32
-#define	MAC_MAX_LABEL_ELEMENT_NAME	32
-#define	MAC_MAX_LABEL_ELEMENT_DATA	4096
-#define	MAC_MAX_LABEL_BUF_LEN		8192
-
-struct mac {
-	size_t		 m_buflen;
-	char		*m_string;
-};
-
-typedef struct mac	*mac_t;
+#include <sys/_label.h>
 
-#ifndef _KERNEL
-
-/*
- * Location of the userland MAC framework configuration file.  mac.conf
- * binds policy names to shared libraries that understand those policies,
- * as well as setting defaults for MAC-aware applications.
- */
-#define	MAC_CONFFILE	"/etc/mac.conf"
-
-/*
- * Extended non-POSIX.1e interfaces that offer additional services
- * available from the userland and kernel MAC frameworks.
- */
-__BEGIN_DECLS
-int	 mac_execve(char *fname, char **argv, char **envv, mac_t _label);
-int	 mac_free(mac_t _label);
-int	 mac_from_text(mac_t *_label, const char *_text);
-int	 mac_get_fd(int _fd, mac_t _label);
-int	 mac_get_file(const char *_path, mac_t _label);
-int	 mac_get_link(const char *_path, mac_t _label);
-int	 mac_get_peer(int _fd, mac_t _label);
-int	 mac_get_pid(pid_t _pid, mac_t _label);
-int	 mac_get_proc(mac_t _label);
-int	 mac_is_present(const char *_policyname);
-int	 mac_prepare(mac_t *_label, const char *_elements);
-int	 mac_prepare_file_label(mac_t *_label);
-int	 mac_prepare_ifnet_label(mac_t *_label);
-int	 mac_prepare_process_label(mac_t *_label);
-int	 mac_prepare_type(mac_t *_label, const char *_type);
-int	 mac_set_fd(int _fildes, const mac_t _label);
-int	 mac_set_file(const char *_path, mac_t _label);
-int	 mac_set_link(const char *_path, mac_t _label);
-int	 mac_set_proc(const mac_t _label);
-int	 mac_syscall(const char *_policyname, int _call, void *_arg);
-int	 mac_to_text(mac_t mac, char **_text);
-__END_DECLS
-
-#else /* _KERNEL */
-
-/*
- * Kernel functions to manage and evaluate labels.
- */
 struct bpf_d;
 struct cdev;
 struct componentname;
@@ -122,6 +63,7 @@
 struct ipq;
 struct ksem;
 struct m_tag;
+struct mac;
 struct mbuf;
 struct mount;
 struct msg;
@@ -140,10 +82,13 @@
 struct uio;
 struct vattr;
 struct vnode;
+struct vop_setlabel_args;
 
 #include <sys/acl.h>			/* XXX acl_type_t */
 
-struct vop_setlabel_args;
+/*
+ * Kernel functions to manage and evaluate labels.
+ */
 
 /*
  * Label operations.
@@ -471,6 +416,4 @@
  */
 int	vop_stdsetlabel_ea(struct vop_setlabel_args *ap);
 
-#endif /* !_KERNEL */
-
-#endif /* !_SYS_MAC_H_ */
+#endif /* !_SYS_MAC_FRAMEWORK_H_ */



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200607060905.k6695D1M055102>