diff options
Diffstat (limited to 'sys/security/mac')
| -rw-r--r-- | sys/security/mac/mac_framework.h | 8 | ||||
| -rw-r--r-- | sys/security/mac/mac_policy.h | 8 | ||||
| -rw-r--r-- | sys/security/mac/mac_sysv_sem.c | 24 |
3 files changed, 20 insertions, 20 deletions
diff --git a/sys/security/mac/mac_framework.h b/sys/security/mac/mac_framework.h index 38c85ff..f33e289 100644 --- a/sys/security/mac/mac_framework.h +++ b/sys/security/mac/mac_framework.h @@ -151,7 +151,7 @@ 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_sema(struct semid_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); @@ -171,7 +171,7 @@ 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_sema(struct semid_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 *); @@ -230,7 +230,7 @@ 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_sema(struct ucred *cred, +void mac_create_sysv_sem(struct ucred *cred, struct semid_kernel *semakptr); void mac_create_sysv_shm(struct ucred *cred, struct shmid_kernel *shmsegptr); @@ -290,7 +290,7 @@ void mac_thread_userret(struct thread *td); */ void mac_cleanup_sysv_msgmsg(struct msg *msgptr); void mac_cleanup_sysv_msgqueue(struct msqid_kernel *msqkptr); -void mac_cleanup_sysv_sema(struct semid_kernel *semakptr); +void mac_cleanup_sysv_sem(struct semid_kernel *semakptr); void mac_cleanup_sysv_shm(struct shmid_kernel *shmsegptr); /* Access control checks. */ diff --git a/sys/security/mac/mac_policy.h b/sys/security/mac/mac_policy.h index cb4ff1c..336dd6e 100644 --- a/sys/security/mac/mac_policy.h +++ b/sys/security/mac/mac_policy.h @@ -106,7 +106,7 @@ struct mac_policy_ops { int (*mpo_init_inpcb_label)(struct label *label, int flag); void (*mpo_init_sysv_msgmsg_label)(struct label *label); void (*mpo_init_sysv_msgqueue_label)(struct label *label); - void (*mpo_init_sysv_sema_label)(struct label *label); + void (*mpo_init_sysv_sem_label)(struct label *label); void (*mpo_init_sysv_shm_label)(struct label *label); int (*mpo_init_ipq_label)(struct label *label, int flag); int (*mpo_init_mbuf_label)(struct label *label, int flag); @@ -125,7 +125,7 @@ struct mac_policy_ops { void (*mpo_destroy_inpcb_label)(struct label *label); void (*mpo_destroy_sysv_msgmsg_label)(struct label *label); void (*mpo_destroy_sysv_msgqueue_label)(struct label *label); - void (*mpo_destroy_sysv_sema_label)(struct label *label); + void (*mpo_destroy_sysv_sem_label)(struct label *label); void (*mpo_destroy_sysv_shm_label)(struct label *label); void (*mpo_destroy_ipq_label)(struct label *label); void (*mpo_destroy_mbuf_label)(struct label *label); @@ -139,7 +139,7 @@ struct mac_policy_ops { void (*mpo_destroy_vnode_label)(struct label *label); void (*mpo_cleanup_sysv_msgmsg)(struct label *msglabel); void (*mpo_cleanup_sysv_msgqueue)(struct label *msqlabel); - void (*mpo_cleanup_sysv_sema)(struct label *semalabel); + void (*mpo_cleanup_sysv_sem)(struct label *semalabel); void (*mpo_cleanup_sysv_shm)(struct label *shmlabel); void (*mpo_copy_cred_label)(struct label *src, struct label *dest); @@ -250,7 +250,7 @@ struct mac_policy_ops { struct msg *msgptr, struct label *msglabel); void (*mpo_create_sysv_msgqueue)(struct ucred *cred, struct msqid_kernel *msqkptr, struct label *msqlabel); - void (*mpo_create_sysv_sema)(struct ucred *cred, + void (*mpo_create_sysv_sem)(struct ucred *cred, struct semid_kernel *semakptr, struct label *semalabel); void (*mpo_create_sysv_shm)(struct ucred *cred, struct shmid_kernel *shmsegptr, struct label *shmlabel); diff --git a/sys/security/mac/mac_sysv_sem.c b/sys/security/mac/mac_sysv_sem.c index 8dc0fcb..76be276 100644 --- a/sys/security/mac/mac_sysv_sem.c +++ b/sys/security/mac/mac_sysv_sem.c @@ -65,52 +65,52 @@ SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, ipc_semas, CTLFLAG_RD, #endif static struct label * -mac_sysv_sema_label_alloc(void) +mac_sysv_sem_label_alloc(void) { struct label *label; label = mac_labelzone_alloc(M_WAITOK); - MAC_PERFORM(init_sysv_sema_label, label); + MAC_PERFORM(init_sysv_sem_label, label); MAC_DEBUG_COUNTER_INC(&nmacipcsemas); return (label); } void -mac_init_sysv_sema(struct semid_kernel *semakptr) +mac_init_sysv_sem(struct semid_kernel *semakptr) { - semakptr->label = mac_sysv_sema_label_alloc(); + semakptr->label = mac_sysv_sem_label_alloc(); } static void -mac_sysv_sema_label_free(struct label *label) +mac_sysv_sem_label_free(struct label *label) { - MAC_PERFORM(destroy_sysv_sema_label, label); + MAC_PERFORM(destroy_sysv_sem_label, label); mac_labelzone_free(label); MAC_DEBUG_COUNTER_DEC(&nmacipcsemas); } void -mac_destroy_sysv_sema(struct semid_kernel *semakptr) +mac_destroy_sysv_sem(struct semid_kernel *semakptr) { - mac_sysv_sema_label_free(semakptr->label); + mac_sysv_sem_label_free(semakptr->label); semakptr->label = NULL; } void -mac_create_sysv_sema(struct ucred *cred, struct semid_kernel *semakptr) +mac_create_sysv_sem(struct ucred *cred, struct semid_kernel *semakptr) { - MAC_PERFORM(create_sysv_sema, cred, semakptr, semakptr->label); + MAC_PERFORM(create_sysv_sem, cred, semakptr, semakptr->label); } void -mac_cleanup_sysv_sema(struct semid_kernel *semakptr) +mac_cleanup_sysv_sem(struct semid_kernel *semakptr) { - MAC_PERFORM(cleanup_sysv_sema, semakptr->label); + MAC_PERFORM(cleanup_sysv_sem, semakptr->label); } int |
