PERFORCE change 100998 for review
Robert Watson
rwatson at FreeBSD.org
Sat Jul 8 13:22:48 UTC 2006
http://perforce.freebsd.org/chv.cgi?CH=100998
Change 100998 by rwatson at rwatson_zoo on 2006/07/08 13:21:51
Rename.
Affected files ...
.. //depot/projects/trustedbsd/mac2/sys/security/mac_test/mac_test.c#3 edit
Differences ...
==== //depot/projects/trustedbsd/mac2/sys/security/mac_test/mac_test.c#3 (text+ko) ====
@@ -301,7 +301,7 @@
* Label operations.
*/
static void
-mac_test_init_bpfdesc_label(struct label *label)
+mac_test_bpfdesc_init_label(struct label *label)
{
SLOT(label) = BPFMAGIC;
@@ -309,7 +309,7 @@
}
static void
-mac_test_init_cred_label(struct label *label)
+mac_test_cred_init_label(struct label *label)
{
SLOT(label) = CREDMAGIC;
@@ -317,7 +317,7 @@
}
static void
-mac_test_init_devfsdirent_label(struct label *label)
+mac_test_devfs_init_label(struct label *label)
{
SLOT(label) = DEVFSMAGIC;
@@ -325,7 +325,7 @@
}
static void
-mac_test_init_ifnet_label(struct label *label)
+mac_test_ifnet_init_label(struct label *label)
{
SLOT(label) = IFNETMAGIC;
@@ -333,12 +333,12 @@
}
static int
-mac_test_init_inpcb_label(struct label *label, int flag)
+mac_test_inpcb_init_label(struct label *label, int flag)
{
if (flag & M_WAITOK)
WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL,
- "mac_test_init_inpcb_label() at %s:%d", __FILE__,
+ "mac_test_inpcb_init_label() at %s:%d", __FILE__,
__LINE__);
SLOT(label) = INPCBMAGIC;
@@ -347,40 +347,40 @@
}
static void
-mac_test_init_sysv_msgmsg_label(struct label *label)
+mac_test_sysvmsg_init_label(struct label *label)
{
SLOT(label) = SYSVIPCMSGMAGIC;
atomic_add_int(&init_count_sysv_msg, 1);
}
static void
-mac_test_init_sysv_msgqueue_label(struct label *label)
+mac_test_sysvmsq_init_label(struct label *label)
{
SLOT(label) = SYSVIPCMSQMAGIC;
atomic_add_int(&init_count_sysv_msq, 1);
}
static void
-mac_test_init_sysv_sem_label(struct label *label)
+mac_test_sysvsem_init_label(struct label *label)
{
SLOT(label) = SYSVIPCSEMMAGIC;
atomic_add_int(&init_count_sysv_sem, 1);
}
static void
-mac_test_init_sysv_shm_label(struct label *label)
+mac_test_sysvshm_init_label(struct label *label)
{
SLOT(label) = SYSVIPCSHMMAGIC;
atomic_add_int(&init_count_sysv_shm, 1);
}
static int
-mac_test_init_ipq_label(struct label *label, int flag)
+mac_test_ipq_init_label(struct label *label, int flag)
{
if (flag & M_WAITOK)
WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL,
- "mac_test_init_ipq_label() at %s:%d", __FILE__,
+ "mac_test_ipq_init_label() at %s:%d", __FILE__,
__LINE__);
SLOT(label) = IPQMAGIC;
@@ -389,12 +389,12 @@
}
static int
-mac_test_init_mbuf_label(struct label *label, int flag)
+mac_test_mbuf_init_label(struct label *label, int flag)
{
if (flag & M_WAITOK)
WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL,
- "mac_test_init_mbuf_label() at %s:%d", __FILE__,
+ "mac_test_mbuf_init_label() at %s:%d", __FILE__,
__LINE__);
SLOT(label) = MBUFMAGIC;
@@ -403,7 +403,7 @@
}
static void
-mac_test_init_mount_label(struct label *label)
+mac_test_mount_init_label(struct label *label)
{
SLOT(label) = MOUNTMAGIC;
@@ -411,12 +411,12 @@
}
static int
-mac_test_init_socket_label(struct label *label, int flag)
+mac_test_socket_init_label(struct label *label, int flag)
{
if (flag & M_WAITOK)
WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL,
- "mac_test_init_socket_label() at %s:%d", __FILE__,
+ "mac_test_socket_init_label() at %s:%d", __FILE__,
__LINE__);
SLOT(label) = SOCKETMAGIC;
@@ -425,12 +425,12 @@
}
static int
-mac_test_init_socket_peer_label(struct label *label, int flag)
+mac_test_socket_peer_init_label(struct label *label, int flag)
{
if (flag & M_WAITOK)
WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL,
- "mac_test_init_socket_peer_label() at %s:%d", __FILE__,
+ "mac_test_socket_peer_init_label() at %s:%d", __FILE__,
__LINE__);
SLOT(label) = SOCKETMAGIC;
@@ -439,7 +439,7 @@
}
static void
-mac_test_init_pipe_label(struct label *label)
+mac_test_pipe_init_label(struct label *label)
{
SLOT(label) = PIPEMAGIC;
@@ -447,7 +447,7 @@
}
static void
-mac_test_init_posix_sem_label(struct label *label)
+mac_test_posix_sem_init_label(struct label *label)
{
SLOT(label) = POSIXSEMMAGIC;
@@ -455,7 +455,7 @@
}
static void
-mac_test_init_proc_label(struct label *label)
+mac_test_proc_init_label(struct label *label)
{
SLOT(label) = PROCMAGIC;
@@ -463,7 +463,7 @@
}
static void
-mac_test_init_vnode_label(struct label *label)
+mac_test_vnode_init_label(struct label *label)
{
SLOT(label) = VNODEMAGIC;
@@ -471,149 +471,149 @@
}
static void
-mac_test_destroy_bpfdesc_label(struct label *label)
+mac_test_bpfdesc_destroy_label(struct label *label)
{
if (SLOT(label) == BPFMAGIC || SLOT(label) == 0) {
atomic_add_int(&destroy_count_bpfdesc, 1);
SLOT(label) = EXMAGIC;
} else if (SLOT(label) == EXMAGIC) {
- DEBUGGER("mac_test_destroy_bpfdesc: dup destroy");
+ DEBUGGER("mac_test_bpfdesc_destroy: dup destroy");
} else {
- DEBUGGER("mac_test_destroy_bpfdesc: corrupted label");
+ DEBUGGER("mac_test_bpfdesc_destroy: corrupted label");
}
}
static void
-mac_test_destroy_cred_label(struct label *label)
+mac_test_cred_destroy_label(struct label *label)
{
if (SLOT(label) == CREDMAGIC || SLOT(label) == 0) {
atomic_add_int(&destroy_count_cred, 1);
SLOT(label) = EXMAGIC;
} else if (SLOT(label) == EXMAGIC) {
- DEBUGGER("mac_test_destroy_cred: dup destroy");
+ DEBUGGER("mac_test_cred_destroy: dup destroy");
} else {
- DEBUGGER("mac_test_destroy_cred: corrupted label");
+ DEBUGGER("mac_test_cred_destroy: corrupted label");
}
}
static void
-mac_test_destroy_devfsdirent_label(struct label *label)
+mac_test_devfs_destroy_label(struct label *label)
{
if (SLOT(label) == DEVFSMAGIC || SLOT(label) == 0) {
atomic_add_int(&destroy_count_devfsdirent, 1);
SLOT(label) = EXMAGIC;
} else if (SLOT(label) == EXMAGIC) {
- DEBUGGER("mac_test_destroy_devfsdirent: dup destroy");
+ DEBUGGER("mac_test_devfs_destroy: dup destroy");
} else {
- DEBUGGER("mac_test_destroy_devfsdirent: corrupted label");
+ DEBUGGER("mac_test_devfs_destroy: corrupted label");
}
}
static void
-mac_test_destroy_ifnet_label(struct label *label)
+mac_test_ifnet_destroy_label(struct label *label)
{
if (SLOT(label) == IFNETMAGIC || SLOT(label) == 0) {
atomic_add_int(&destroy_count_ifnet, 1);
SLOT(label) = EXMAGIC;
} else if (SLOT(label) == EXMAGIC) {
- DEBUGGER("mac_test_destroy_ifnet: dup destroy");
+ DEBUGGER("mac_test_ifnet_destroy: dup destroy");
} else {
- DEBUGGER("mac_test_destroy_ifnet: corrupted label");
+ DEBUGGER("mac_test_ifnet_destroy: corrupted label");
}
}
static void
-mac_test_destroy_inpcb_label(struct label *label)
+mac_test_inpcb_destroy_label(struct label *label)
{
if (SLOT(label) == INPCBMAGIC || SLOT(label) == 0) {
atomic_add_int(&destroy_count_inpcb, 1);
SLOT(label) = EXMAGIC;
} else if (SLOT(label) == EXMAGIC) {
- DEBUGGER("mac_test_destroy_inpcb: dup destroy");
+ DEBUGGER("mac_test_inpcb_destroy: dup destroy");
} else {
- DEBUGGER("mac_test_destroy_inpcb: corrupted label");
+ DEBUGGER("mac_test_inpcb_destroy: corrupted label");
}
}
static void
-mac_test_destroy_sysv_msgmsg_label(struct label *label)
+mac_test_sysvmsg_destroy_label(struct label *label)
{
if (SLOT(label) == SYSVIPCMSGMAGIC || SLOT(label) == 0) {
atomic_add_int(&destroy_count_sysv_msg, 1);
SLOT(label) = EXMAGIC;
} else if (SLOT(label) == EXMAGIC) {
- DEBUGGER("mac_test_destroy_sysv_msgmsg_label: dup destroy");
+ DEBUGGER("mac_test_sysvmsg_destroy_label: dup destroy");
} else {
DEBUGGER(
- "mac_test_destroy_sysv_msgmsg_label: corrupted label");
+ "mac_test_sysvmsg_destroy_label: corrupted label");
}
}
static void
-mac_test_destroy_sysv_msgqueue_label(struct label *label)
+mac_test_sysvmsq_destroy_label(struct label *label)
{
if (SLOT(label) == SYSVIPCMSQMAGIC || SLOT(label) == 0) {
atomic_add_int(&destroy_count_sysv_msq, 1);
SLOT(label) = EXMAGIC;
} else if (SLOT(label) == EXMAGIC) {
- DEBUGGER("mac_test_destroy_sysv_msgqueue_label: dup destroy");
+ DEBUGGER("mac_test_sysvmsq_destroy_label: dup destroy");
} else {
DEBUGGER(
- "mac_test_destroy_sysv_msgqueue_label: corrupted label");
+ "mac_test_sysvmsq_destroy_label: corrupted label");
}
}
static void
-mac_test_destroy_sysv_sem_label(struct label *label)
+mac_test_sysvsem_destroy_label(struct label *label)
{
if (SLOT(label) == SYSVIPCSEMMAGIC || SLOT(label) == 0) {
atomic_add_int(&destroy_count_sysv_sem, 1);
SLOT(label) = EXMAGIC;
} else if (SLOT(label) == EXMAGIC) {
- DEBUGGER("mac_test_destroy_sysv_sem_label: dup destroy");
+ DEBUGGER("mac_test_sysvsem_destroy_label: dup destroy");
} else {
- DEBUGGER("mac_test_destroy_sysv_sem_label: corrupted label");
+ DEBUGGER("mac_test_sysvsem_destroy_label: corrupted label");
}
}
static void
-mac_test_destroy_sysv_shm_label(struct label *label)
+mac_test_sysvshm_destroy_label(struct label *label)
{
if (SLOT(label) == SYSVIPCSHMMAGIC || SLOT(label) == 0) {
atomic_add_int(&destroy_count_sysv_shm, 1);
SLOT(label) = EXMAGIC;
} else if (SLOT(label) == EXMAGIC) {
- DEBUGGER("mac_test_destroy_sysv_shm_label: dup destroy");
+ DEBUGGER("mac_test_sysvshm_destroy_label: dup destroy");
} else {
- DEBUGGER("mac_test_destroy_sysv_shm_label: corrupted label");
+ DEBUGGER("mac_test_sysvshm_destroy_label: corrupted label");
}
}
static void
-mac_test_destroy_ipq_label(struct label *label)
+mac_test_ipq_destroy_label(struct label *label)
{
if (SLOT(label) == IPQMAGIC || SLOT(label) == 0) {
atomic_add_int(&destroy_count_ipq, 1);
SLOT(label) = EXMAGIC;
} else if (SLOT(label) == EXMAGIC) {
- DEBUGGER("mac_test_destroy_ipq: dup destroy");
+ DEBUGGER("mac_test_ipq_destroy: dup destroy");
} else {
- DEBUGGER("mac_test_destroy_ipq: corrupted label");
+ DEBUGGER("mac_test_ipq_destroy: corrupted label");
}
}
static void
-mac_test_destroy_mbuf_label(struct label *label)
+mac_test_mbuf_destroy_label(struct label *label)
{
/*
@@ -628,112 +628,112 @@
atomic_add_int(&destroy_count_mbuf, 1);
SLOT(label) = EXMAGIC;
} else if (SLOT(label) == EXMAGIC) {
- DEBUGGER("mac_test_destroy_mbuf: dup destroy");
+ DEBUGGER("mac_test_mbuf_destroy: dup destroy");
} else {
- DEBUGGER("mac_test_destroy_mbuf: corrupted label");
+ DEBUGGER("mac_test_mbuf_destroy: corrupted label");
}
}
static void
-mac_test_destroy_mount_label(struct label *label)
+mac_test_mount_destroy_label(struct label *label)
{
if ((SLOT(label) == MOUNTMAGIC || SLOT(label) == 0)) {
atomic_add_int(&destroy_count_mount, 1);
SLOT(label) = EXMAGIC;
} else if (SLOT(label) == EXMAGIC) {
- DEBUGGER("mac_test_destroy_mount: dup destroy");
+ DEBUGGER("mac_test_mount_destroy: dup destroy");
} else {
- DEBUGGER("mac_test_destroy_mount: corrupted label");
+ DEBUGGER("mac_test_mount_destroy: corrupted label");
}
}
static void
-mac_test_destroy_socket_label(struct label *label)
+mac_test_socket_destroy_label(struct label *label)
{
if ((SLOT(label) == SOCKETMAGIC || SLOT(label) == 0)) {
atomic_add_int(&destroy_count_socket, 1);
SLOT(label) = EXMAGIC;
} else if (SLOT(label) == EXMAGIC) {
- DEBUGGER("mac_test_destroy_socket: dup destroy");
+ DEBUGGER("mac_test_socket_destroy: dup destroy");
} else {
- DEBUGGER("mac_test_destroy_socket: corrupted label");
+ DEBUGGER("mac_test_socket_destroy: corrupted label");
}
}
static void
-mac_test_destroy_socket_peer_label(struct label *label)
+mac_test_socket_peer_destroy_label(struct label *label)
{
if ((SLOT(label) == SOCKETMAGIC || SLOT(label) == 0)) {
atomic_add_int(&destroy_count_socket_peerlabel, 1);
SLOT(label) = EXMAGIC;
} else if (SLOT(label) == EXMAGIC) {
- DEBUGGER("mac_test_destroy_socket_peerlabel: dup destroy");
+ DEBUGGER("mac_test_socket_peer_destroylabel: dup destroy");
} else {
- DEBUGGER("mac_test_destroy_socket_peerlabel: corrupted label");
+ DEBUGGER("mac_test_socket_peer_destroylabel: corrupted label");
}
}
static void
-mac_test_destroy_pipe_label(struct label *label)
+mac_test_pipe_destroy_label(struct label *label)
{
if ((SLOT(label) == PIPEMAGIC || SLOT(label) == 0)) {
atomic_add_int(&destroy_count_pipe, 1);
SLOT(label) = EXMAGIC;
} else if (SLOT(label) == EXMAGIC) {
- DEBUGGER("mac_test_destroy_pipe: dup destroy");
+ DEBUGGER("mac_test_pipe_destroy: dup destroy");
} else {
- DEBUGGER("mac_test_destroy_pipe: corrupted label");
+ DEBUGGER("mac_test_pipe_destroy: corrupted label");
}
}
static void
-mac_test_destroy_posix_sem_label(struct label *label)
+mac_test_posix_sem_destroy_label(struct label *label)
{
if ((SLOT(label) == POSIXSEMMAGIC || SLOT(label) == 0)) {
atomic_add_int(&destroy_count_posixsems, 1);
SLOT(label) = EXMAGIC;
} else if (SLOT(label) == EXMAGIC) {
- DEBUGGER("mac_test_destroy_posix_sem: dup destroy");
+ DEBUGGER("mac_test_posix_sem_destroy: dup destroy");
} else {
- DEBUGGER("mac_test_destroy_posix_sem: corrupted label");
+ DEBUGGER("mac_test_posix_sem_destroy: corrupted label");
}
}
static void
-mac_test_destroy_proc_label(struct label *label)
+mac_test_proc_destroy_label(struct label *label)
{
if ((SLOT(label) == PROCMAGIC || SLOT(label) == 0)) {
atomic_add_int(&destroy_count_proc, 1);
SLOT(label) = EXMAGIC;
} else if (SLOT(label) == EXMAGIC) {
- DEBUGGER("mac_test_destroy_proc: dup destroy");
+ DEBUGGER("mac_test_proc_destroy: dup destroy");
} else {
- DEBUGGER("mac_test_destroy_proc: corrupted label");
+ DEBUGGER("mac_test_proc_destroy: corrupted label");
}
}
static void
-mac_test_destroy_vnode_label(struct label *label)
+mac_test_vnode_destroy_label(struct label *label)
{
if (SLOT(label) == VNODEMAGIC || SLOT(label) == 0) {
atomic_add_int(&destroy_count_vnode, 1);
SLOT(label) = EXMAGIC;
} else if (SLOT(label) == EXMAGIC) {
- DEBUGGER("mac_test_destroy_vnode: dup destroy");
+ DEBUGGER("mac_test_vnode_destroy: dup destroy");
} else {
- DEBUGGER("mac_test_destroy_vnode: corrupted label");
+ DEBUGGER("mac_test_vnode_destroy: corrupted label");
}
}
static void
-mac_test_copy_cred_label(struct label *src, struct label *dest)
+mac_test_cred_copy_label(struct label *src, struct label *dest)
{
ASSERT_CRED_LABEL(src);
@@ -741,7 +741,7 @@
}
static void
-mac_test_copy_ifnet_label(struct label *src, struct label *dest)
+mac_test_ifnet_copy_label(struct label *src, struct label *dest)
{
ASSERT_IFNET_LABEL(src);
@@ -749,7 +749,7 @@
}
static void
-mac_test_copy_mbuf_label(struct label *src, struct label *dest)
+mac_test_mbuf_copy_label(struct label *src, struct label *dest)
{
ASSERT_MBUF_LABEL(src);
@@ -757,7 +757,7 @@
}
static void
-mac_test_copy_pipe_label(struct label *src, struct label *dest)
+mac_test_pipe_copy_label(struct label *src, struct label *dest)
{
ASSERT_PIPE_LABEL(src);
@@ -765,7 +765,7 @@
}
static void
-mac_test_copy_socket_label(struct label *src, struct label *dest)
+mac_test_socket_copy_label(struct label *src, struct label *dest)
{
ASSERT_SOCKET_LABEL(src);
@@ -773,7 +773,7 @@
}
static void
-mac_test_copy_vnode_label(struct label *src, struct label *dest)
+mac_test_vnode_copy_label(struct label *src, struct label *dest)
{
ASSERT_VNODE_LABEL(src);
@@ -811,7 +811,7 @@
* a lot like file system objects.
*/
static void
-mac_test_associate_vnode_devfs(struct mount *mp, struct label *mntlabel,
+mac_test_devfs_vnode_associate(struct mount *mp, struct label *mntlabel,
struct devfs_dirent *de, struct label *delabel, struct vnode *vp,
struct label *vlabel)
{
@@ -822,7 +822,7 @@
}
static int
-mac_test_associate_vnode_extattr(struct mount *mp, struct label *mntlabel,
+mac_test_vnode_associate_extattr(struct mount *mp, struct label *mntlabel,
struct vnode *vp, struct label *vlabel)
{
@@ -832,7 +832,7 @@
}
static void
-mac_test_associate_vnode_singlelabel(struct mount *mp,
+mac_test_vnode_associate_singlelabel(struct mount *mp,
struct label *mntlabel, struct vnode *vp, struct label *vlabel)
{
@@ -841,7 +841,7 @@
}
static void
-mac_test_create_devfs_device(struct ucred *cred, struct mount *mp,
+mac_test_devfs_create_device(struct ucred *cred, struct mount *mp,
struct cdev *dev, struct devfs_dirent *devfs_dirent, struct label *label)
{
@@ -852,7 +852,7 @@
}
static void
-mac_test_create_devfs_directory(struct mount *mp, char *dirname,
+mac_test_devfs_create_directory(struct mount *mp, char *dirname,
int dirnamelen, struct devfs_dirent *devfs_dirent, struct label *label)
{
@@ -860,7 +860,7 @@
}
static void
-mac_test_create_devfs_symlink(struct ucred *cred, struct mount *mp,
+mac_test_devfs_create_symlink(struct ucred *cred, struct mount *mp,
struct devfs_dirent *dd, struct label *ddlabel, struct devfs_dirent *de,
struct label *delabel)
{
@@ -871,7 +871,7 @@
}
static int
-mac_test_create_vnode_extattr(struct ucred *cred, struct mount *mp,
+mac_test_vnode_create_extattr(struct ucred *cred, struct mount *mp,
struct label *mntlabel, struct vnode *dvp, struct label *dlabel,
struct vnode *vp, struct label *vlabel, struct componentname *cnp)
{
@@ -884,7 +884,7 @@
}
static void
-mac_test_create_mount(struct ucred *cred, struct mount *mp,
+mac_test_mount_create(struct ucred *cred, struct mount *mp,
struct label *mntlabel)
{
@@ -893,7 +893,7 @@
}
static void
-mac_test_relabel_vnode(struct ucred *cred, struct vnode *vp,
+mac_test_vnode_relabel(struct ucred *cred, struct vnode *vp,
struct label *vnodelabel, struct label *label)
{
@@ -903,7 +903,7 @@
}
static int
-mac_test_setlabel_vnode_extattr(struct ucred *cred, struct vnode *vp,
+mac_test_vnode_setlabel_extattr(struct ucred *cred, struct vnode *vp,
struct label *vlabel, struct label *intlabel)
{
@@ -914,7 +914,7 @@
}
static void
-mac_test_update_devfsdirent(struct mount *mp,
+mac_test_devfs_update(struct mount *mp,
struct devfs_dirent *devfs_dirent, struct label *direntlabel,
struct vnode *vp, struct label *vnodelabel)
{
@@ -927,7 +927,7 @@
* Labeling event operations: IPC object.
*/
static void
-mac_test_create_mbuf_from_socket(struct socket *so, struct label *socketlabel,
+mac_test_socket_create_mbuf(struct socket *so, struct label *socketlabel,
struct mbuf *m, struct label *mbuflabel)
{
@@ -936,7 +936,7 @@
}
static void
-mac_test_create_socket(struct ucred *cred, struct socket *socket,
+mac_test_socket_create(struct ucred *cred, struct socket *socket,
struct label *socketlabel)
{
@@ -945,7 +945,7 @@
}
static void
-mac_test_create_pipe(struct ucred *cred, struct pipepair *pp,
+mac_test_pipe_create(struct ucred *cred, struct pipepair *pp,
struct label *pipelabel)
{
@@ -954,7 +954,7 @@
}
static void
-mac_test_create_posix_sem(struct ucred *cred, struct ksem *ksem,
+mac_test_posix_sem_create(struct ucred *cred, struct ksem *ksem,
struct label *posixlabel)
{
@@ -963,7 +963,7 @@
}
static void
-mac_test_create_socket_from_socket(struct socket *oldsocket,
+mac_test_socket_accept(struct socket *oldsocket,
struct label *oldsocketlabel, struct socket *newsocket,
struct label *newsocketlabel)
{
@@ -973,7 +973,7 @@
}
static void
-mac_test_relabel_socket(struct ucred *cred, struct socket *socket,
+mac_test_socket_relabel(struct ucred *cred, struct socket *socket,
struct label *socketlabel, struct label *newlabel)
{
@@ -982,7 +982,7 @@
}
static void
-mac_test_relabel_pipe(struct ucred *cred, struct pipepair *pp,
+mac_test_pipe_relabel(struct ucred *cred, struct pipepair *pp,
struct label *pipelabel, struct label *newlabel)
{
@@ -992,7 +992,7 @@
}
static void
-mac_test_set_socket_peer_from_mbuf(struct mbuf *mbuf, struct label *mbuflabel,
+mac_test_socket_peer_set_from_mbuf(struct mbuf *mbuf, struct label *mbuflabel,
struct socket *socket, struct label *socketpeerlabel)
{
@@ -1004,7 +1004,7 @@
* Labeling event operations: network objects.
*/
static void
-mac_test_set_socket_peer_from_socket(struct socket *oldsocket,
+mac_test_socket_peer_set_from_socket(struct socket *oldsocket,
struct label *oldsocketlabel, struct socket *newsocket,
struct label *newsocketpeerlabel)
{
@@ -1014,7 +1014,7 @@
}
static void
-mac_test_create_bpfdesc(struct ucred *cred, struct bpf_d *bpf_d,
+mac_test_bpfdesc_create(struct ucred *cred, struct bpf_d *bpf_d,
struct label *bpflabel)
{
@@ -1023,7 +1023,7 @@
}
static void
-mac_test_create_datagram_from_ipq(struct ipq *ipq, struct label *ipqlabel,
+mac_test_ipq_reassemble(struct ipq *ipq, struct label *ipqlabel,
struct mbuf *datagram, struct label *datagramlabel)
{
@@ -1032,7 +1032,7 @@
}
static void
-mac_test_create_fragment(struct mbuf *datagram, struct label *datagramlabel,
+mac_test_netinet_fragment(struct mbuf *datagram, struct label *datagramlabel,
struct mbuf *fragment, struct label *fragmentlabel)
{
@@ -1041,14 +1041,14 @@
}
static void
-mac_test_create_ifnet(struct ifnet *ifnet, struct label *ifnetlabel)
+mac_test_ifnet_create(struct ifnet *ifnet, struct label *ifnetlabel)
{
ASSERT_IFNET_LABEL(ifnetlabel);
}
static void
-mac_test_create_inpcb_from_socket(struct socket *so, struct label *solabel,
+mac_test_inpcb_create(struct socket *so, struct label *solabel,
struct inpcb *inp, struct label *inplabel)
{
@@ -1057,7 +1057,7 @@
}
static void
-mac_test_create_sysv_msgmsg(struct ucred *cred, struct msqid_kernel *msqkptr,
+mac_test_sysvmsg_create(struct ucred *cred, struct msqid_kernel *msqkptr,
struct label *msqlabel, struct msg *msgptr, struct label *msglabel)
{
@@ -1066,7 +1066,7 @@
}
static void
-mac_test_create_sysv_msgqueue(struct ucred *cred,
+mac_test_sysvmsq_create(struct ucred *cred,
struct msqid_kernel *msqkptr, struct label *msqlabel)
{
@@ -1074,7 +1074,7 @@
}
static void
-mac_test_create_sysv_sem(struct ucred *cred, struct semid_kernel *semakptr,
+mac_test_sysvsem_create(struct ucred *cred, struct semid_kernel *semakptr,
struct label *semalabel)
{
@@ -1082,7 +1082,7 @@
}
static void
-mac_test_create_sysv_shm(struct ucred *cred, struct shmid_kernel *shmsegptr,
+mac_test_sysvshm_create(struct ucred *cred, struct shmid_kernel *shmsegptr,
struct label *shmlabel)
{
@@ -1090,7 +1090,7 @@
}
static void
-mac_test_create_ipq(struct mbuf *fragment, struct label *fragmentlabel,
+mac_test_ipq_create(struct mbuf *fragment, struct label *fragmentlabel,
struct ipq *ipq, struct label *ipqlabel)
{
@@ -1099,7 +1099,7 @@
}
static void
-mac_test_create_mbuf_from_inpcb(struct inpcb *inp, struct label *inplabel,
+mac_test_inpcb_create_mbuf(struct inpcb *inp, struct label *inplabel,
struct mbuf *m, struct label *mlabel)
{
@@ -1108,7 +1108,7 @@
}
static void
-mac_test_create_mbuf_linklayer(struct ifnet *ifnet, struct label *ifnetlabel,
+mac_test_mbuf_create_linklayer(struct ifnet *ifnet, struct label *ifnetlabel,
struct mbuf *mbuf, struct label *mbuflabel)
{
@@ -1117,7 +1117,7 @@
}
static void
-mac_test_create_mbuf_from_bpfdesc(struct bpf_d *bpf_d, struct label *bpflabel,
+mac_test_bpfdesc_create_mbuf(struct bpf_d *bpf_d, struct label *bpflabel,
struct mbuf *mbuf, struct label *mbuflabel)
{
@@ -1126,7 +1126,7 @@
}
static void
-mac_test_create_mbuf_from_ifnet(struct ifnet *ifnet, struct label *ifnetlabel,
+mac_test_ifnet_create_mbuf(struct ifnet *ifnet, struct label *ifnetlabel,
struct mbuf *m, struct label *mbuflabel)
{
@@ -1135,7 +1135,7 @@
}
static void
-mac_test_create_mbuf_multicast_encap(struct mbuf *oldmbuf,
+mac_test_mbuf_create_multicast_encap(struct mbuf *oldmbuf,
struct label *oldmbuflabel, struct ifnet *ifnet, struct label *ifnetlabel,
struct mbuf *newmbuf, struct label *newmbuflabel)
{
@@ -1146,7 +1146,7 @@
}
static void
-mac_test_create_mbuf_netlayer(struct mbuf *oldmbuf,
+mac_test_mbuf_create_netlayer(struct mbuf *oldmbuf,
struct label *oldmbuflabel, struct mbuf *newmbuf,
struct label *newmbuflabel)
{
@@ -1156,7 +1156,7 @@
}
static int
-mac_test_fragment_match(struct mbuf *fragment, struct label *fragmentlabel,
+mac_test_ipq_match(struct mbuf *fragment, struct label *fragmentlabel,
struct ipq *ipq, struct label *ipqlabel)
{
@@ -1167,21 +1167,21 @@
}
static void
-mac_test_reflect_mbuf_icmp(struct mbuf *m, struct label *mlabel)
+mac_test_netinet_icmp_reply(struct mbuf *m, struct label *mlabel)
{
ASSERT_MBUF_LABEL(mlabel);
}
static void
-mac_test_reflect_mbuf_tcp(struct mbuf *m, struct label *mlabel)
+mac_test_netinet_tcp_reply(struct mbuf *m, struct label *mlabel)
{
ASSERT_MBUF_LABEL(mlabel);
}
static void
-mac_test_relabel_ifnet(struct ucred *cred, struct ifnet *ifnet,
+mac_test_ifnet_relabel(struct ucred *cred, struct ifnet *ifnet,
struct label *ifnetlabel, struct label *newlabel)
{
@@ -1191,7 +1191,7 @@
}
static void
-mac_test_update_ipq(struct mbuf *fragment, struct label *fragmentlabel,
+mac_test_ipq_update(struct mbuf *fragment, struct label *fragmentlabel,
struct ipq *ipq, struct label *ipqlabel)
{
@@ -1212,7 +1212,7 @@
* Labeling event operations: processes.
*/
static void
-mac_test_execve_transition(struct ucred *old, struct ucred *new,
+mac_test_vnode_execve_transition(struct ucred *old, struct ucred *new,
struct vnode *vp, struct label *filelabel,
struct label *interpvnodelabel, struct image_params *imgp,
struct label *execlabel)
@@ -1230,7 +1230,7 @@
}
static int
-mac_test_execve_will_transition(struct ucred *old, struct vnode *vp,
+mac_test_vnode_execve_will_transition(struct ucred *old, struct vnode *vp,
struct label *filelabel, struct label *interpvnodelabel,
struct image_params *imgp, struct label *execlabel)
{
@@ -1248,21 +1248,21 @@
}
static void
-mac_test_create_proc0(struct ucred *cred)
+mac_test_proc_create_swapper(struct ucred *cred)
{
ASSERT_CRED_LABEL(cred->cr_label);
}
static void
-mac_test_create_proc1(struct ucred *cred)
+mac_test_proc_create_init(struct ucred *cred)
{
ASSERT_CRED_LABEL(cred->cr_label);
}
static void
-mac_test_relabel_cred(struct ucred *cred, struct label *newlabel)
+mac_test_cred_relabel(struct ucred *cred, struct label *newlabel)
{
ASSERT_CRED_LABEL(cred->cr_label);
@@ -1281,28 +1281,28 @@
* Label cleanup/flush operations
*/
static void
-mac_test_cleanup_sysv_msgmsg(struct label *msglabel)
+mac_test_sysvmsg_cleanup(struct label *msglabel)
{
ASSERT_SYSVIPCMSG_LABEL(msglabel);
}
static void
-mac_test_cleanup_sysv_msgqueue(struct label *msqlabel)
+mac_test_sysvmsq_cleanup(struct label *msqlabel)
{
ASSERT_SYSVIPCMSQ_LABEL(msqlabel);
}
static void
-mac_test_cleanup_sysv_sem(struct label *semalabel)
+mac_test_sysvsem_cleanup(struct label *semalabel)
{
ASSERT_SYSVIPCSEM_LABEL(semalabel);
}
static void
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the trustedbsd-cvs
mailing list