diff options
author | Dominik Brodowski <linux@dominikbrodowski.net> | 2018-03-20 15:07:53 -0400 |
---|---|---|
committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2018-04-02 14:15:24 -0400 |
commit | 65749e0bb5e7de876ee43d3f601e32afe17e9248 (patch) | |
tree | b660b2e32014e8fb2a405c7d75f7dba0095e1f49 | |
parent | 3d65661a494a11266500c2532b4f163537c379db (diff) |
ipc: add shmget syscall wrapper
Provide ksys_shmget() 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_shmget().
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>
-rw-r--r-- | ipc/shm.c | 7 | ||||
-rw-r--r-- | ipc/syscall.c | 4 | ||||
-rw-r--r-- | ipc/util.h | 1 |
3 files changed, 9 insertions, 3 deletions
@@ -656,7 +656,7 @@ static inline int shm_more_checks(struct kern_ipc_perm *ipcp, | |||
656 | return 0; | 656 | return 0; |
657 | } | 657 | } |
658 | 658 | ||
659 | SYSCALL_DEFINE3(shmget, key_t, key, size_t, size, int, shmflg) | 659 | long ksys_shmget(key_t key, size_t size, int shmflg) |
660 | { | 660 | { |
661 | struct ipc_namespace *ns; | 661 | struct ipc_namespace *ns; |
662 | static const struct ipc_ops shm_ops = { | 662 | static const struct ipc_ops shm_ops = { |
@@ -675,6 +675,11 @@ SYSCALL_DEFINE3(shmget, key_t, key, size_t, size, int, shmflg) | |||
675 | return ipcget(ns, &shm_ids(ns), &shm_ops, &shm_params); | 675 | return ipcget(ns, &shm_ids(ns), &shm_ops, &shm_params); |
676 | } | 676 | } |
677 | 677 | ||
678 | SYSCALL_DEFINE3(shmget, key_t, key, size_t, size, int, shmflg) | ||
679 | { | ||
680 | return ksys_shmget(key, size, shmflg); | ||
681 | } | ||
682 | |||
678 | static inline unsigned long copy_shmid_to_user(void __user *buf, struct shmid64_ds *in, int version) | 683 | static inline unsigned long copy_shmid_to_user(void __user *buf, struct shmid64_ds *in, int version) |
679 | { | 684 | { |
680 | switch (version) { | 685 | switch (version) { |
diff --git a/ipc/syscall.c b/ipc/syscall.c index 355c4a644bbf..60bceb19b6f0 100644 --- a/ipc/syscall.c +++ b/ipc/syscall.c | |||
@@ -92,7 +92,7 @@ SYSCALL_DEFINE6(ipc, unsigned int, call, int, first, unsigned long, second, | |||
92 | case SHMDT: | 92 | case SHMDT: |
93 | return sys_shmdt((char __user *)ptr); | 93 | return sys_shmdt((char __user *)ptr); |
94 | case SHMGET: | 94 | case SHMGET: |
95 | return sys_shmget(first, second, third); | 95 | return ksys_shmget(first, second, third); |
96 | case SHMCTL: | 96 | case SHMCTL: |
97 | return sys_shmctl(first, second, | 97 | return sys_shmctl(first, second, |
98 | (struct shmid_ds __user *) ptr); | 98 | (struct shmid_ds __user *) ptr); |
@@ -180,7 +180,7 @@ COMPAT_SYSCALL_DEFINE6(ipc, u32, call, int, first, int, second, | |||
180 | case SHMDT: | 180 | case SHMDT: |
181 | return sys_shmdt(compat_ptr(ptr)); | 181 | return sys_shmdt(compat_ptr(ptr)); |
182 | case SHMGET: | 182 | case SHMGET: |
183 | return sys_shmget(first, (unsigned)second, third); | 183 | return ksys_shmget(first, (unsigned int)second, third); |
184 | case SHMCTL: | 184 | case SHMCTL: |
185 | return compat_sys_shmctl(first, second, compat_ptr(ptr)); | 185 | return compat_sys_shmctl(first, second, compat_ptr(ptr)); |
186 | } | 186 | } |
diff --git a/ipc/util.h b/ipc/util.h index b35c0dfe3bc3..51002c0b2a21 100644 --- a/ipc/util.h +++ b/ipc/util.h | |||
@@ -243,6 +243,7 @@ long ksys_semtimedop(int semid, struct sembuf __user *tsops, | |||
243 | long ksys_semget(key_t key, int nsems, int semflg); | 243 | long ksys_semget(key_t key, int nsems, int semflg); |
244 | long ksys_semctl(int semid, int semnum, int cmd, unsigned long arg); | 244 | long ksys_semctl(int semid, int semnum, int cmd, unsigned long arg); |
245 | long ksys_msgget(key_t key, int msgflg); | 245 | long ksys_msgget(key_t key, int msgflg); |
246 | long ksys_shmget(key_t key, size_t size, int shmflg); | ||
246 | 247 | ||
247 | /* for CONFIG_ARCH_WANT_OLD_COMPAT_IPC */ | 248 | /* for CONFIG_ARCH_WANT_OLD_COMPAT_IPC */ |
248 | #ifdef CONFIG_COMPAT | 249 | #ifdef CONFIG_COMPAT |