aboutsummaryrefslogtreecommitdiffstats
path: root/ipc/sem.c
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2018-03-20 14:48:14 -0400
committerDominik Brodowski <linux@dominikbrodowski.net>2018-04-02 14:15:21 -0400
commit41f4f0e2f5f4cd060885405c04214851ffe7b299 (patch)
tree3c465c0218ef422e7d7dd5553c8531479f97d654 /ipc/sem.c
parent6df354653e8cc07be1f057d9207e1092c0b3963b (diff)
ipc: add semtimedop syscall/compat_syscall wrappers
Provide ksys_semtimedop() and compat_ksys_semtimedop() wrappers to avoid in-kernel calls to these syscalls. The ksys_ prefix denotes that these functions are meant as a drop-in replacement for the syscalls. In particular, they use the same calling convention as sys_semtimedop() and compat_sys_semtimedop(). 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/sem.c')
-rw-r--r--ipc/sem.c23
1 files changed, 18 insertions, 5 deletions
diff --git a/ipc/sem.c b/ipc/sem.c
index a4af04979fd2..e21ceb8b4af1 100644
--- a/ipc/sem.c
+++ b/ipc/sem.c
@@ -2120,8 +2120,8 @@ out_free:
2120 return error; 2120 return error;
2121} 2121}
2122 2122
2123SYSCALL_DEFINE4(semtimedop, int, semid, struct sembuf __user *, tsops, 2123long ksys_semtimedop(int semid, struct sembuf __user *tsops,
2124 unsigned, nsops, const struct timespec __user *, timeout) 2124 unsigned int nsops, const struct timespec __user *timeout)
2125{ 2125{
2126 if (timeout) { 2126 if (timeout) {
2127 struct timespec64 ts; 2127 struct timespec64 ts;
@@ -2132,10 +2132,16 @@ SYSCALL_DEFINE4(semtimedop, int, semid, struct sembuf __user *, tsops,
2132 return do_semtimedop(semid, tsops, nsops, NULL); 2132 return do_semtimedop(semid, tsops, nsops, NULL);
2133} 2133}
2134 2134
2135SYSCALL_DEFINE4(semtimedop, int, semid, struct sembuf __user *, tsops,
2136 unsigned int, nsops, const struct timespec __user *, timeout)
2137{
2138 return ksys_semtimedop(semid, tsops, nsops, timeout);
2139}
2140
2135#ifdef CONFIG_COMPAT 2141#ifdef CONFIG_COMPAT
2136COMPAT_SYSCALL_DEFINE4(semtimedop, int, semid, struct sembuf __user *, tsems, 2142long compat_ksys_semtimedop(int semid, struct sembuf __user *tsems,
2137 unsigned, nsops, 2143 unsigned int nsops,
2138 const struct compat_timespec __user *, timeout) 2144 const struct compat_timespec __user *timeout)
2139{ 2145{
2140 if (timeout) { 2146 if (timeout) {
2141 struct timespec64 ts; 2147 struct timespec64 ts;
@@ -2145,6 +2151,13 @@ COMPAT_SYSCALL_DEFINE4(semtimedop, int, semid, struct sembuf __user *, tsems,
2145 } 2151 }
2146 return do_semtimedop(semid, tsems, nsops, NULL); 2152 return do_semtimedop(semid, tsems, nsops, NULL);
2147} 2153}
2154
2155COMPAT_SYSCALL_DEFINE4(semtimedop, int, semid, struct sembuf __user *, tsems,
2156 unsigned int, nsops,
2157 const struct compat_timespec __user *, timeout)
2158{
2159 return compat_ksys_semtimedop(semid, tsems, nsops, timeout);
2160}
2148#endif 2161#endif
2149 2162
2150SYSCALL_DEFINE3(semop, int, semid, struct sembuf __user *, tsops, 2163SYSCALL_DEFINE3(semop, int, semid, struct sembuf __user *, tsops,