diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2018-03-24 05:41:55 +0100 |
---|---|---|
committer | Eric W. Biederman <ebiederm@xmission.com> | 2018-03-27 22:53:56 +0200 |
commit | 50ab44b1c5d1b13305ce8acb74c8e50e0dcbaedc (patch) | |
tree | a26481edc4510e3a92c7993e1567e56d8d71a1da /ipc/sem.c | |
parent | ipc/sem: Fix semctl(..., GETPID, ...) between pid namespaces (diff) | |
download | linux-50ab44b1c5d1b13305ce8acb74c8e50e0dcbaedc.tar.xz linux-50ab44b1c5d1b13305ce8acb74c8e50e0dcbaedc.zip |
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.c | 10 |
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) /* * Called with sem_ids.rwsem and ipcp locked. */ -static inline int sem_security(struct kern_ipc_perm *ipcp, int semflg) -{ - return security_sem_associate(ipcp, semflg); -} - -/* - * Called with sem_ids.rwsem and ipcp locked. - */ static inline int sem_more_checks(struct kern_ipc_perm *ipcp, struct ipc_params *params) { @@ -592,7 +584,7 @@ SYSCALL_DEFINE3(semget, key_t, key, int, nsems, int, semflg) struct ipc_namespace *ns; static const struct ipc_ops sem_ops = { .getnew = newary, - .associate = sem_security, + .associate = security_sem_associate, .more_checks = sem_more_checks, }; struct ipc_params sem_params; |