diff options
| author |   Eric W. Biederman <ebiederm@xmission.com> | 2018-03-23 23:41:55 -0500 |
|---|---|---|
| committer | Eric W. Biederman <ebiederm@xmission.com> | 2018-03-27 15:53:56 -0500 |
| commit | 50ab44b1c5d1b13305ce8acb74c8e50e0dcbaedc (patch) | |
| tree | a26481edc4510e3a92c7993e1567e56d8d71a1da /ipc/msg.c | |
| parent | ipc/sem: Fix semctl(..., GETPID, ...) between pid namespaces (diff) | |
| download | linux-dev-50ab44b1c5d1b13305ce8acb74c8e50e0dcbaedc.tar.xz linux-dev-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/msg.c')
| -rw-r--r-- | ipc/msg.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/ipc/msg.c b/ipc/msg.c index 825ad585a6ff..d667dd8e97ab 100644 --- a/ipc/msg.c +++ b/ipc/msg.c @@ -272,20 +272,12 @@ static void freeque(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp) ipc_rcu_putref(&msq->q_perm, msg_rcu_free); } -/* - * Called with msg_ids.rwsem and ipcp locked. - */ -static inline int msg_security(struct kern_ipc_perm *ipcp, int msgflg) -{ - return security_msg_queue_associate(ipcp, msgflg); -} - SYSCALL_DEFINE2(msgget, key_t, key, int, msgflg) { struct ipc_namespace *ns; static const struct ipc_ops msg_ops = { .getnew = newque, - .associate = msg_security, + .associate = security_msg_queue_associate, }; struct ipc_params msg_params; |