]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
ipc: introduce ksys_ipc()/compat_ksys_ipc() for s390
authorArnd Bergmann <arnd@arndb.de>
Wed, 16 Jan 2019 13:15:20 +0000 (14:15 +0100)
committerMartin Schwidefsky <schwidefsky@de.ibm.com>
Fri, 18 Jan 2019 08:33:18 +0000 (09:33 +0100)
The sys_ipc() and compat_ksys_ipc() functions are meant to only
be used from the system call table, not called by another function.

Introduce ksys_*() interfaces for this purpose, as we have done
for many other system calls.

Link: https://lore.kernel.org/lkml/20190116131527.2071570-3-arnd@arndb.de
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Heiko Carstens <heiko.carstens@de.ibm.com>
[heiko.carstens@de.ibm.com: compile fix for !CONFIG_COMPAT]
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
arch/s390/kernel/compat_linux.c
arch/s390/kernel/sys_s390.c
include/linux/syscalls.h
ipc/syscall.c
kernel/sys_ni.c

index 8ac38d51ed7de4f467ea7c69760b5a6f84a78998..a47f6d3c6d5b5c1fa7cea904e814404d75d62035 100644 (file)
@@ -296,7 +296,7 @@ COMPAT_SYSCALL_DEFINE5(s390_ipc, uint, call, int, first, compat_ulong_t, second,
 {
        if (call >> 16)         /* hack for backward compatibility */
                return -EINVAL;
-       return compat_sys_ipc(call, first, second, third, ptr, third);
+       return compat_ksys_ipc(call, first, second, third, ptr, third);
 }
 #endif
 
index 560bdaf8a74fd220c52f1f8787a94ee3f95fac37..fd0cbbed4d9f8495abac02e1111113a3834f9fc9 100644 (file)
@@ -58,6 +58,7 @@ SYSCALL_DEFINE1(mmap2, struct s390_mmap_arg_struct __user *, arg)
        return error;
 }
 
+#ifdef CONFIG_SYSVIPC
 /*
  * sys_ipc() is the de-multiplexer for the SysV IPC calls.
  */
@@ -74,8 +75,9 @@ SYSCALL_DEFINE5(s390_ipc, uint, call, int, first, unsigned long, second,
         * Therefore we can call the generic variant by simply passing the
         * third parameter also as fifth parameter.
         */
-       return sys_ipc(call, first, second, third, ptr, third);
+       return ksys_ipc(call, first, second, third, ptr, third);
 }
+#endif /* CONFIG_SYSVIPC */
 
 SYSCALL_DEFINE1(s390_personality, unsigned int, personality)
 {
index 257cccba30625726c0f78670b3a2c6188ee801eb..fb63045a0fb65c97daef3e932513c232278e37a3 100644 (file)
@@ -1185,6 +1185,10 @@ unsigned long ksys_mmap_pgoff(unsigned long addr, unsigned long len,
                              unsigned long prot, unsigned long flags,
                              unsigned long fd, unsigned long pgoff);
 ssize_t ksys_readahead(int fd, loff_t offset, size_t count);
+int ksys_ipc(unsigned int call, int first, unsigned long second,
+       unsigned long third, void __user * ptr, long fifth);
+int compat_ksys_ipc(u32 call, int first, int second,
+       u32 third, u32 ptr, u32 fifth);
 
 /*
  * The following kernel syscall equivalents are just wrappers to fs-internal
index 1ac06e3983c0fe41446ad81f7702d7ad0283a07d..3cf8ad703a4dd7c9c211b00d3280b9265a98b062 100644 (file)
@@ -17,8 +17,8 @@
 #include <linux/shm.h>
 #include <linux/uaccess.h>
 
-SYSCALL_DEFINE6(ipc, unsigned int, call, int, first, unsigned long, second,
-               unsigned long, third, void __user *, ptr, long, fifth)
+int ksys_ipc(unsigned int call, int first, unsigned long second,
+       unsigned long third, void __user * ptr, long fifth)
 {
        int version, ret;
 
@@ -106,6 +106,12 @@ SYSCALL_DEFINE6(ipc, unsigned int, call, int, first, unsigned long, second,
                return -ENOSYS;
        }
 }
+
+SYSCALL_DEFINE6(ipc, unsigned int, call, int, first, unsigned long, second,
+               unsigned long, third, void __user *, ptr, long, fifth)
+{
+       return ksys_ipc(call, first, second, third, ptr, fifth);
+}
 #endif
 
 #ifdef CONFIG_COMPAT
@@ -121,8 +127,8 @@ struct compat_ipc_kludge {
 };
 
 #ifdef CONFIG_ARCH_WANT_OLD_COMPAT_IPC
-COMPAT_SYSCALL_DEFINE6(ipc, u32, call, int, first, int, second,
-       u32, third, compat_uptr_t, ptr, u32, fifth)
+int compat_ksys_ipc(u32 call, int first, int second,
+       u32 third, compat_uptr_t ptr, u32 fifth)
 {
        int version;
        u32 pad;
@@ -195,5 +201,11 @@ COMPAT_SYSCALL_DEFINE6(ipc, u32, call, int, first, int, second,
 
        return -ENOSYS;
 }
+
+COMPAT_SYSCALL_DEFINE6(ipc, u32, call, int, first, int, second,
+       u32, third, compat_uptr_t, ptr, u32, fifth)
+{
+       return compat_ksys_ipc(call, first, second, third, ptr, fifth);
+}
 #endif
 #endif
index ab9d0e3c6d5072b624a37279b28eb6c440ebfb48..bc934f31ab10c390136e43c1d8ac10810040589b 100644 (file)
@@ -366,6 +366,7 @@ COND_SYSCALL(kexec_file_load);
 /* s390 */
 COND_SYSCALL(s390_pci_mmio_read);
 COND_SYSCALL(s390_pci_mmio_write);
+COND_SYSCALL(s390_ipc);
 COND_SYSCALL_COMPAT(s390_ipc);
 
 /* powerpc */