summaryrefslogtreecommitdiffstats
path: root/ipc
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2018-03-20 14:53:58 -0400
committerDominik Brodowski <linux@dominikbrodowski.net>2018-04-02 14:15:22 -0400
commit69894718a515fef7ff633cf354fcd7ed73a88891 (patch)
tree1330521d67fa886f829af4d8e5a6677b826eaaf4 /ipc
parent41f4f0e2f5f4cd060885405c04214851ffe7b299 (diff)
ipc: add semget syscall wrapper
Provide ksys_semget() wrapper to avoid in-kernel calls to this syscall. The ksys_ prefix denotes that this function is meant as a drop-in replacement for the syscall. In particular, it uses the same calling convention as sys_semget(). This patch is part of a series which removes in-kernel calls to syscalls. On this basis, the syscall entry path can be streamlined. For details, see http://lkml.kernel.org/r/20180325162527.GA17492@light.dominikbrodowski.net Cc: Al Viro <viro@zeniv.linux.org.uk> Cc: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'ipc')
-rw-r--r--ipc/sem.c7
-rw-r--r--ipc/syscall.c4
-rw-r--r--ipc/util.h1
3 files changed, 9 insertions, 3 deletions
diff --git a/ipc/sem.c b/ipc/sem.c
index e21ceb8b4af1..2e5f7ec7a7db 100644
--- a/ipc/sem.c
+++ b/ipc/sem.c
@@ -556,7 +556,7 @@ static inline int sem_more_checks(struct kern_ipc_perm *ipcp,
556 return 0; 556 return 0;
557} 557}
558 558
559SYSCALL_DEFINE3(semget, key_t, key, int, nsems, int, semflg) 559long ksys_semget(key_t key, int nsems, int semflg)
560{ 560{
561 struct ipc_namespace *ns; 561 struct ipc_namespace *ns;
562 static const struct ipc_ops sem_ops = { 562 static const struct ipc_ops sem_ops = {
@@ -578,6 +578,11 @@ SYSCALL_DEFINE3(semget, key_t, key, int, nsems, int, semflg)
578 return ipcget(ns, &sem_ids(ns), &sem_ops, &sem_params); 578 return ipcget(ns, &sem_ids(ns), &sem_ops, &sem_params);
579} 579}
580 580
581SYSCALL_DEFINE3(semget, key_t, key, int, nsems, int, semflg)
582{
583 return ksys_semget(key, nsems, semflg);
584}
585
581/** 586/**
582 * perform_atomic_semop[_slow] - Attempt to perform semaphore 587 * perform_atomic_semop[_slow] - Attempt to perform semaphore
583 * operations on a given array. 588 * operations on a given array.
diff --git a/ipc/syscall.c b/ipc/syscall.c
index 84d6a7691baa..21fcdf0b4836 100644
--- a/ipc/syscall.c
+++ b/ipc/syscall.c
@@ -35,7 +35,7 @@ SYSCALL_DEFINE6(ipc, unsigned int, call, int, first, unsigned long, second,
35 (const struct timespec __user *)fifth); 35 (const struct timespec __user *)fifth);
36 36
37 case SEMGET: 37 case SEMGET:
38 return sys_semget(first, second, third); 38 return ksys_semget(first, second, third);
39 case SEMCTL: { 39 case SEMCTL: {
40 unsigned long arg; 40 unsigned long arg;
41 if (!ptr) 41 if (!ptr)
@@ -132,7 +132,7 @@ COMPAT_SYSCALL_DEFINE6(ipc, u32, call, int, first, int, second,
132 return compat_ksys_semtimedop(first, compat_ptr(ptr), second, 132 return compat_ksys_semtimedop(first, compat_ptr(ptr), second,
133 compat_ptr(fifth)); 133 compat_ptr(fifth));
134 case SEMGET: 134 case SEMGET:
135 return sys_semget(first, second, third); 135 return ksys_semget(first, second, third);
136 case SEMCTL: 136 case SEMCTL:
137 if (!ptr) 137 if (!ptr)
138 return -EINVAL; 138 return -EINVAL;
diff --git a/ipc/util.h b/ipc/util.h
index 6deadf77547e..0f07056e5a73 100644
--- a/ipc/util.h
+++ b/ipc/util.h
@@ -240,6 +240,7 @@ static inline int compat_ipc_parse_version(int *cmd)
240long ksys_semtimedop(int semid, struct sembuf __user *tsops, 240long ksys_semtimedop(int semid, struct sembuf __user *tsops,
241 unsigned int nsops, 241 unsigned int nsops,
242 const struct timespec __user *timeout); 242 const struct timespec __user *timeout);
243long ksys_semget(key_t key, int nsems, int semflg);
243 244
244/* for CONFIG_ARCH_WANT_OLD_COMPAT_IPC */ 245/* for CONFIG_ARCH_WANT_OLD_COMPAT_IPC */
245#ifdef CONFIG_COMPAT 246#ifdef CONFIG_COMPAT