summaryrefslogtreecommitdiffstats
path: root/ipc/shm.c
diff options
context:
space:
mode:
Diffstat (limited to 'ipc/shm.c')
-rw-r--r--ipc/shm.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/ipc/shm.c b/ipc/shm.c
index 932b7e411c6c..018db3d0e70e 100644
--- a/ipc/shm.c
+++ b/ipc/shm.c
@@ -659,14 +659,6 @@ no_file:
659/* 659/*
660 * Called with shm_ids.rwsem and ipcp locked. 660 * Called with shm_ids.rwsem and ipcp locked.
661 */ 661 */
662static inline int shm_security(struct kern_ipc_perm *ipcp, int shmflg)
663{
664 return security_shm_associate(ipcp, shmflg);
665}
666
667/*
668 * Called with shm_ids.rwsem and ipcp locked.
669 */
670static inline int shm_more_checks(struct kern_ipc_perm *ipcp, 662static inline int shm_more_checks(struct kern_ipc_perm *ipcp,
671 struct ipc_params *params) 663 struct ipc_params *params)
672{ 664{
@@ -684,7 +676,7 @@ SYSCALL_DEFINE3(shmget, key_t, key, size_t, size, int, shmflg)
684 struct ipc_namespace *ns; 676 struct ipc_namespace *ns;
685 static const struct ipc_ops shm_ops = { 677 static const struct ipc_ops shm_ops = {
686 .getnew = newseg, 678 .getnew = newseg,
687 .associate = shm_security, 679 .associate = security_shm_associate,
688 .more_checks = shm_more_checks, 680 .more_checks = shm_more_checks,
689 }; 681 };
690 struct ipc_params shm_params; 682 struct ipc_params shm_params;