PERFORCE change 64822 for review
Robert Watson
rwatson at FreeBSD.org
Wed Nov 10 15:03:27 GMT 2004
http://perforce.freebsd.org/chv.cgi?CH=64822
Change 64822 by rwatson at rwatson_tislabs on 2004/11/10 15:02:28
Catch up with System V IPC entry point renaming in the MAC branch.
Affected files ...
.. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/sebsd.c#33 edit
Differences ...
==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/sebsd.c#33 (text+ko) ====
@@ -378,7 +378,7 @@
}
static void
-sebsd_init_ipc_label(struct label *label)
+sebsd_init_sysv_label(struct label *label)
{
struct ipc_security_struct *new;
@@ -403,7 +403,7 @@
}
static void
-sebsd_cleanup_ipc_label(struct label *label)
+sebsd_cleanup_sysv_label(struct label *label)
{
struct ipc_security_struct *ipcsec;
@@ -536,7 +536,7 @@
}
static void
-sebsd_create_ipc_msgmsg(struct ucred *cred, struct msqid_kernel *msqkptr,
+sebsd_create_sysv_msgmsg(struct ucred *cred, struct msqid_kernel *msqkptr,
struct label *msqlabel, struct msg *msgptr, struct label *msglabel)
{
struct task_security_struct *tsec;
@@ -556,14 +556,14 @@
if(security_transition_sid(tsec->sid, msqsec->sid,
SECCLASS_MSG, &msgsec->sid) < 0) {
printf("Warning: security_transition_sid failed on"
- "create_ipc_msgmsg\n");
+ "create_sysv_msgmsg\n");
printf("Assigning the requesting thread's sid to the msg\n");
msgsec->sid = tsec->sid;
}
}
static void
-sebsd_create_ipc_msgqueue(struct ucred *cred, struct msqid_kernel *msqkptr,
+sebsd_create_sysv_msgqueue(struct ucred *cred, struct msqid_kernel *msqkptr,
struct label *msqlabel)
{
struct task_security_struct *tsec;
@@ -577,7 +577,7 @@
}
static void
-sebsd_create_ipc_sema(struct ucred *cred, struct semid_kernel *semakptr,
+sebsd_create_sysv_sema(struct ucred *cred, struct semid_kernel *semakptr,
struct label *semalabel)
{
struct task_security_struct *tsec;
@@ -591,7 +591,7 @@
}
static void
-sebsd_create_ipc_shm(struct ucred *cred, struct shmid_kernel *shmsegptr,
+sebsd_create_sysv_shm(struct ucred *cred, struct shmid_kernel *shmsegptr,
struct label *shmlabel)
{
struct task_security_struct *tsec;
@@ -2092,7 +2092,7 @@
}
static int
-sebsd_check_ipc_msgrcv(struct ucred *cred, struct msg *msgptr,
+sebsd_check_sysv_msgrcv(struct ucred *cred, struct msg *msgptr,
struct label *msglabel)
{
@@ -2100,7 +2100,7 @@
}
static int
-sebsd_check_ipc_msgrmid(struct ucred *cred, struct msg *msgptr,
+sebsd_check_sysv_msgrmid(struct ucred *cred, struct msg *msgptr,
struct label *msglabel)
{
@@ -2108,7 +2108,7 @@
}
static int
-sebsd_check_ipc_msqget(struct ucred *cred, struct msqid_kernel *msqkptr,
+sebsd_check_sysv_msqget(struct ucred *cred, struct msqid_kernel *msqkptr,
struct label *msqklabel)
{
@@ -2116,7 +2116,7 @@
}
static int
-sebsd_check_ipc_msqsnd(struct ucred *cred, struct msqid_kernel *msqkptr,
+sebsd_check_sysv_msqsnd(struct ucred *cred, struct msqid_kernel *msqkptr,
struct label *msqklabel)
{
@@ -2125,7 +2125,7 @@
}
static int
-sebsd_check_ipc_msgmsq(struct ucred *cred, struct msg *msgptr,
+sebsd_check_sysv_msgmsq(struct ucred *cred, struct msg *msgptr,
struct label *msglabel, struct msqid_kernel *msqkptr,
struct label *msqklabel)
{
@@ -2154,7 +2154,7 @@
}
static int
-sebsd_check_ipc_msqrcv(struct ucred *cred, struct msqid_kernel *msqkptr,
+sebsd_check_sysv_msqrcv(struct ucred *cred, struct msqid_kernel *msqkptr,
struct label *msqklabel)
{
@@ -2162,7 +2162,7 @@
}
static int
-sebsd_check_ipc_msqctl(struct ucred *cred, struct msqid_kernel *msqkptr,
+sebsd_check_sysv_msqctl(struct ucred *cred, struct msqid_kernel *msqkptr,
struct label *msqklabel, int cmd)
{
access_vector_t perm;
@@ -2188,7 +2188,7 @@
}
static int
-sebsd_check_ipc_semctl(struct ucred *cred, struct semid_kernel *semakptr,
+sebsd_check_sysv_semctl(struct ucred *cred, struct semid_kernel *semakptr,
struct label *semaklabel, int cmd)
{
access_vector_t perm;
@@ -2227,7 +2227,7 @@
}
static int
-sebsd_check_ipc_semget(struct ucred *cred, struct semid_kernel *semakptr,
+sebsd_check_sysv_semget(struct ucred *cred, struct semid_kernel *semakptr,
struct label *semaklabel)
{
@@ -2235,7 +2235,7 @@
}
static int
-sebsd_check_ipc_semop(struct ucred *cred, struct semid_kernel *semakptr,
+sebsd_check_sysv_semop(struct ucred *cred, struct semid_kernel *semakptr,
struct label *semaklabel, size_t accesstype)
{
access_vector_t perm;
@@ -2250,7 +2250,7 @@
}
static int
-sebsd_check_ipc_shmat(struct ucred *cred, struct shmid_kernel *shmsegptr,
+sebsd_check_sysv_shmat(struct ucred *cred, struct shmid_kernel *shmsegptr,
struct label *shmseglabel, int shmflg)
{
access_vector_t perm;
@@ -2264,7 +2264,7 @@
}
static int
-sebsd_check_ipc_shmctl(struct ucred *cred, struct shmid_kernel *shmsegptr,
+sebsd_check_sysv_shmctl(struct ucred *cred, struct shmid_kernel *shmsegptr,
struct label *shmseglabel, int cmd)
{
access_vector_t perm;
@@ -2289,7 +2289,7 @@
}
static int
-sebsd_check_ipc_shmget(struct ucred *cred, struct shmid_kernel *shmsegptr,
+sebsd_check_sysv_shmget(struct ucred *cred, struct shmid_kernel *shmsegptr,
struct label *shmseglabel, int shmflg)
{
@@ -2360,16 +2360,16 @@
.mpo_init_devfsdirent_label = sebsd_init_vnode_label,
.mpo_init_file_label = sebsd_init_file_label,
.mpo_init_ifnet_label = sebsd_init_network_label,
- .mpo_init_ipc_msgmsg_label = sebsd_init_ipc_label,
- .mpo_init_ipc_msgqueue_label = sebsd_init_ipc_label,
- .mpo_init_ipc_sema_label = sebsd_init_ipc_label,
- .mpo_init_ipc_shm_label = sebsd_init_ipc_label,
+ .mpo_init_sysv_msgmsg_label = sebsd_init_sysv_label,
+ .mpo_init_sysv_msgqueue_label = sebsd_init_sysv_label,
+ .mpo_init_sysv_sema_label = sebsd_init_sysv_label,
+ .mpo_init_sysv_shm_label = sebsd_init_sysv_label,
.mpo_init_ipq_label = sebsd_init_network_label_waitcheck,
.mpo_init_mbuf_label = sebsd_init_network_label_waitcheck,
.mpo_init_mount_label = sebsd_init_mount_label,
.mpo_init_mount_fs_label = sebsd_init_mount_fs_label,
.mpo_init_pipe_label = sebsd_init_vnode_label,
- .mpo_init_posix_ksem_label = sebsd_init_ipc_label,
+ .mpo_init_posix_ksem_label = sebsd_init_sysv_label,
.mpo_init_socket_label = sebsd_init_network_label_waitcheck,
.mpo_init_socket_peer_label = sebsd_init_network_label_waitcheck,
.mpo_init_vnode_label = sebsd_init_vnode_label,
@@ -2380,10 +2380,10 @@
.mpo_destroy_cred_label = sebsd_destroy_label,
.mpo_destroy_devfsdirent_label = sebsd_destroy_label,
.mpo_destroy_ifnet_label = sebsd_destroy_label,
- .mpo_destroy_ipc_msgmsg_label = sebsd_destroy_label,
- .mpo_destroy_ipc_msgqueue_label = sebsd_destroy_label,
- .mpo_destroy_ipc_sema_label = sebsd_destroy_label,
- .mpo_destroy_ipc_shm_label = sebsd_destroy_label,
+ .mpo_destroy_sysv_msgmsg_label = sebsd_destroy_label,
+ .mpo_destroy_sysv_msgqueue_label = sebsd_destroy_label,
+ .mpo_destroy_sysv_sema_label = sebsd_destroy_label,
+ .mpo_destroy_sysv_shm_label = sebsd_destroy_label,
.mpo_destroy_ipq_label = sebsd_destroy_label,
.mpo_destroy_mbuf_label = sebsd_destroy_label,
.mpo_destroy_file_label = sebsd_destroy_label,
@@ -2440,10 +2440,10 @@
.mpo_create_devfs_directory = sebsd_create_devfs_directory,
.mpo_create_devfs_symlink = sebsd_create_devfs_symlink,
.mpo_create_file = sebsd_create_file,
- .mpo_create_ipc_msgmsg = sebsd_create_ipc_msgmsg,
- .mpo_create_ipc_msgqueue = sebsd_create_ipc_msgqueue,
- .mpo_create_ipc_sema = sebsd_create_ipc_sema,
- .mpo_create_ipc_shm = sebsd_create_ipc_shm,
+ .mpo_create_sysv_msgmsg = sebsd_create_sysv_msgmsg,
+ .mpo_create_sysv_msgqueue = sebsd_create_sysv_msgqueue,
+ .mpo_create_sysv_sema = sebsd_create_sysv_sema,
+ .mpo_create_sysv_shm = sebsd_create_sysv_shm,
/* .mpo_create_mbuf_from_socket = sebsd_create_mbuf_from_socket, */
.mpo_create_mount = sebsd_create_mount,
.mpo_create_pipe = sebsd_create_pipe,
@@ -2478,20 +2478,20 @@
.mpo_check_mount = sebsd_check_mount,
.mpo_check_umount = sebsd_check_umount,
.mpo_check_remount = sebsd_check_remount,
- .mpo_check_ipc_msgrcv = sebsd_check_ipc_msgrcv,
- .mpo_check_ipc_msgrmid = sebsd_check_ipc_msgrmid,
- .mpo_check_ipc_msqget = sebsd_check_ipc_msqget,
- .mpo_check_ipc_msqsnd = sebsd_check_ipc_msqsnd,
- .mpo_check_ipc_msgmsq = sebsd_check_ipc_msgmsq,
- .mpo_check_ipc_msqrcv = sebsd_check_ipc_msqrcv,
- .mpo_check_ipc_msqctl = sebsd_check_ipc_msqctl,
- .mpo_check_ipc_semctl = sebsd_check_ipc_semctl,
- .mpo_check_ipc_semget = sebsd_check_ipc_semget,
- .mpo_check_ipc_semop = sebsd_check_ipc_semop,
- .mpo_check_ipc_shmat = sebsd_check_ipc_shmat,
- .mpo_check_ipc_shmctl = sebsd_check_ipc_shmctl,
- /* .mpo_check_ipc_shmdt = sebsd_check_ipc_shmdt, */
- .mpo_check_ipc_shmget = sebsd_check_ipc_shmget,
+ .mpo_check_sysv_msgrcv = sebsd_check_sysv_msgrcv,
+ .mpo_check_sysv_msgrmid = sebsd_check_sysv_msgrmid,
+ .mpo_check_sysv_msqget = sebsd_check_sysv_msqget,
+ .mpo_check_sysv_msqsnd = sebsd_check_sysv_msqsnd,
+ .mpo_check_sysv_msgmsq = sebsd_check_sysv_msgmsq,
+ .mpo_check_sysv_msqrcv = sebsd_check_sysv_msqrcv,
+ .mpo_check_sysv_msqctl = sebsd_check_sysv_msqctl,
+ .mpo_check_sysv_semctl = sebsd_check_sysv_semctl,
+ .mpo_check_sysv_semget = sebsd_check_sysv_semget,
+ .mpo_check_sysv_semop = sebsd_check_sysv_semop,
+ .mpo_check_sysv_shmat = sebsd_check_sysv_shmat,
+ .mpo_check_sysv_shmctl = sebsd_check_sysv_shmctl,
+ /* .mpo_check_sysv_shmdt = sebsd_check_sysv_shmdt, */
+ .mpo_check_sysv_shmget = sebsd_check_sysv_shmget,
.mpo_check_mount_stat = sebsd_check_mount_stat,
.mpo_check_pipe_ioctl = sebsd_check_pipe_ioctl,
@@ -2557,10 +2557,10 @@
.mpo_setlabel_vnode_extattr = sebsd_setlabel_vnode_extattr,
/*.mpo_set_socket_peer_from_mbuf = sebsd_set_socket_peer_from_mbuf,*/
/*.mpo_set_socket_peer_from_socket = sebsd_set_socket_peer_from_socket,*/
- .mpo_cleanup_ipc_msgmsg = sebsd_cleanup_ipc_label,
- .mpo_cleanup_ipc_msgqueue = sebsd_cleanup_ipc_label,
- .mpo_cleanup_ipc_sema = sebsd_cleanup_ipc_label,
- .mpo_cleanup_ipc_shm = sebsd_cleanup_ipc_label,
+ .mpo_cleanup_sysv_msgmsg = sebsd_cleanup_sysv_label,
+ .mpo_cleanup_sysv_msgqueue = sebsd_cleanup_sysv_label,
+ .mpo_cleanup_sysv_sema = sebsd_cleanup_sysv_label,
+ .mpo_cleanup_sysv_shm = sebsd_cleanup_sysv_label,
.mpo_syscall = sebsd_syscall,
};
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message
More information about the trustedbsd-cvs
mailing list