summaryrefslogtreecommitdiffstats
path: root/ipc/sem.c
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2018-03-24 00:41:55 -0400
committerEric W. Biederman <ebiederm@xmission.com>2018-03-27 16:53:56 -0400
commit50ab44b1c5d1b13305ce8acb74c8e50e0dcbaedc (patch)
treea26481edc4510e3a92c7993e1567e56d8d71a1da /ipc/sem.c
parent51d6f2635b39709ee5e62479be23d423b760292c (diff)
ipc: Directly call the security hook in ipc_ops.associate
After the last round of cleanups the shm, sem, and msg associate operations just became trivial wrappers around the appropriate security method. Simplify things further by just calling the security method directly. Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Diffstat (limited to 'ipc/sem.c')
-rw-r--r--ipc/sem.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/ipc/sem.c b/ipc/sem.c
index 47b263960524..09d54af076a4 100644
--- a/ipc/sem.c
+++ b/ipc/sem.c
@@ -567,14 +567,6 @@ static int newary(struct ipc_namespace *ns, struct ipc_params *params)
567/* 567/*
568 * Called with sem_ids.rwsem and ipcp locked. 568 * Called with sem_ids.rwsem and ipcp locked.
569 */ 569 */
570static inline int sem_security(struct kern_ipc_perm *ipcp, int semflg)
571{
572 return security_sem_associate(ipcp, semflg);
573}
574
575/*
576 * Called with sem_ids.rwsem and ipcp locked.
577 */
578static inline int sem_more_checks(struct kern_ipc_perm *ipcp, 570static inline int sem_more_checks(struct kern_ipc_perm *ipcp,
579 struct ipc_params *params) 571 struct ipc_params *params)
580{ 572{
@@ -592,7 +584,7 @@ SYSCALL_DEFINE3(semget, key_t, key, int, nsems, int, semflg)
592 struct ipc_namespace *ns; 584 struct ipc_namespace *ns;
593 static const struct ipc_ops sem_ops = { 585 static const struct ipc_ops sem_ops = {
594 .getnew = newary, 586 .getnew = newary,
595 .associate = sem_security, 587 .associate = security_sem_associate,
596 .more_checks = sem_more_checks, 588 .more_checks = sem_more_checks,
597 }; 589 };
598 struct ipc_params sem_params; 590 struct ipc_params sem_params;