get rid of compat_sys_semctl() and friends in case of ARCH_WANT_OLD_COMPAT_IPC

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

4 files changed, 73 insertions, 132 deletions

diff --git a/arch/mips/kernel/linux32.c b/arch/mips/kernel/linux32.c
index 7c57b8d7b255..d1d576b765f5 100644
--- a/arch/mips/kernel/linux32.c
+++ b/arch/mips/kernel/linux32.c
@@ -119,30 +119,6 @@ SYSCALL_DEFINE6(32_pwrite, unsigned int, fd, const char __user *, buf,
         return sys_pwrite64(fd, buf, count, merge_64(a4, a5));
 }
 
-#ifdef CONFIG_MIPS32_N32
-SYSCALL_DEFINE4(n32_semctl, int, semid, int, semnum, int, cmd, u32, arg)
-{
-        /* compat_sys_semctl expects a pointer to union semun */
-        u32 __user *uptr = compat_alloc_user_space(sizeof(u32));
-        if (put_user(arg, uptr))
-                return -EFAULT;
-        return compat_sys_semctl(semid, semnum, cmd, uptr);
-}
-
-SYSCALL_DEFINE4(n32_msgsnd, int, msqid, u32, msgp, unsigned int, msgsz,
-        int, msgflg)
-{
-        return compat_sys_msgsnd(msqid, msgsz, msgflg, compat_ptr(msgp));
-}
-
-SYSCALL_DEFINE5(n32_msgrcv, int, msqid, u32, msgp, size_t, msgsz,
-        int, msgtyp, int, msgflg)
-{
-        return compat_sys_msgrcv(msqid, msgsz, msgtyp, msgflg, IPC_64,
-                                 compat_ptr(msgp));
-}
-#endif
-
 SYSCALL_DEFINE1(32_personality, unsigned long, personality)
 {
         unsigned int p = personality & 0xffffffff;
diff --git a/arch/mips/kernel/scall64-n32.S b/arch/mips/kernel/scall64-n32.S
index 9b4df498fc5b..edcb6594e7b5 100644
--- a/arch/mips/kernel/scall64-n32.S
+++ b/arch/mips/kernel/scall64-n32.S
@@ -168,11 +168,11 @@ EXPORT(sysn32_call_table)
         PTR     sys_newuname
         PTR     sys_semget
         PTR     sys_semop
-        PTR     sys_n32_semctl
+        PTR     compat_sys_semctl
         PTR     sys_shmdt                       /* 6065 */
         PTR     sys_msgget
-        PTR     sys_n32_msgsnd
-        PTR     sys_n32_msgrcv
+        PTR     compat_sys_msgsnd
+        PTR     compat_sys_msgrcv
         PTR     compat_sys_msgctl
         PTR     compat_sys_fcntl                /* 6070 */
         PTR     sys_flock
diff --git a/include/linux/compat.h b/include/linux/compat.h
index 79a4781ac502..2bfe67329dc4 100644
--- a/include/linux/compat.h
+++ b/include/linux/compat.h
@@ -311,22 +311,13 @@ asmlinkage long
 compat_sys_get_robust_list(int pid, compat_uptr_t __user *head_ptr,
                            compat_size_t __user *len_ptr);
 
-#ifdef CONFIG_ARCH_WANT_OLD_COMPAT_IPC
-long compat_sys_semctl(int first, int second, int third, void __user *uptr);
-long compat_sys_msgsnd(int first, int second, int third, void __user *uptr);
-long compat_sys_msgrcv(int first, int second, int msgtyp, int third,
-                int version, void __user *uptr);
-long compat_sys_shmat(int first, int second, compat_uptr_t third, int version,
-                void __user *uptr);
 asmlinkage long compat_sys_ipc(u32, int, int, u32, compat_uptr_t, u32);
-#else
-long compat_sys_semctl(int semid, int semnum, int cmd, int arg);
-long compat_sys_msgsnd(int msqid, struct compat_msgbuf __user *msgp,
+asmlinkage long compat_sys_shmat(int shmid, compat_uptr_t shmaddr, int shmflg);
+asmlinkage long compat_sys_semctl(int semid, int semnum, int cmd, int arg);
+asmlinkage long compat_sys_msgsnd(int msqid, compat_uptr_t msgp,
                 compat_ssize_t msgsz, int msgflg);
-long compat_sys_msgrcv(int msqid, struct compat_msgbuf __user *msgp,
+asmlinkage long compat_sys_msgrcv(int msqid, compat_uptr_t msgp,
                 compat_ssize_t msgsz, long msgtyp, int msgflg);
-long compat_sys_shmat(int shmid, compat_uptr_t shmaddr, int shmflg);
-#endif
 long compat_sys_msgctl(int first, int second, void __user *uptr);
 long compat_sys_shmctl(int first, int second, void __user *uptr);
 long compat_sys_semtimedop(int semid, struct sembuf __user *tsems,
diff --git a/ipc/compat.c b/ipc/compat.c
index 1da2e2eb9d70..6cb6a4df86e4 100644
--- a/ipc/compat.c
+++ b/ipc/compat.c
@@ -306,7 +306,7 @@ static long do_compat_semctl(int first, int second, int third, u32 pad)
         return err;
 }
 
-long compat_do_msg_fill(void __user *dest, struct msg_msg *msg, size_t bufsz)
+static long compat_do_msg_fill(void __user *dest, struct msg_msg *msg, size_t bufsz)
 {
         struct compat_msgbuf __user *msgp = dest;
         size_t msgsz;
@@ -320,59 +320,16 @@ long compat_do_msg_fill(void __user *dest, struct msg_msg *msg, size_t bufsz)
         return msgsz;
 }
 
-#ifdef CONFIG_ARCH_WANT_OLD_COMPAT_IPC
-long compat_sys_semctl(int first, int second, int third, void __user *uptr)
-{
-        u32 pad;
-
-        if (!uptr)
-                return -EINVAL;
-        if (get_user(pad, (u32 __user *) uptr))
-                return -EFAULT;
-        return do_compat_semctl(first, second, third, pad);
-}
-
-long compat_sys_msgsnd(int first, int second, int third, void __user *uptr)
-{
-        struct compat_msgbuf __user *up = uptr;
-        long type;
-
-        if (first < 0)
-                return -EINVAL;
-        if (second < 0)
-                return -EINVAL;
-
-        if (get_user(type, &up->mtype))
-                return -EFAULT;
-
-        return do_msgsnd(first, type, up->mtext, second, third);
-}
-
-long compat_sys_msgrcv(int first, int second, int msgtyp, int third,
-                           int version, void __user *uptr)
-{
-        if (first < 0)
-                return -EINVAL;
-        if (second < 0)
-                return -EINVAL;
-
-        if (!version) {
-                struct compat_ipc_kludge ipck;
-                if (!uptr)
-                        return -EINVAL;
-                if (copy_from_user (&ipck, uptr, sizeof(ipck)))
-                        return -EFAULT;
-                uptr = compat_ptr(ipck.msgp);
-                msgtyp = ipck.msgtyp;
-        }
-        return do_msgrcv(first, uptr, second, msgtyp, third,
-                         compat_do_msg_fill);
-}
+#ifndef COMPAT_SHMLBA
+#define COMPAT_SHMLBA   SHMLBA
+#endif
 
+#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 version;
+        u32 pad;
 
         version = call >> 16; /* hack for backward compatibility */
         call &= 0xffff;
@@ -387,21 +344,59 @@ COMPAT_SYSCALL_DEFINE6(ipc, u32, call, int, first, int, second,
         case SEMGET:
                 return sys_semget(first, second, third);
         case SEMCTL:
-                return compat_sys_semctl(first, second, third, compat_ptr(ptr));
+                if (!ptr)
+                        return -EINVAL;
+                if (get_user(pad, (u32 __user *) compat_ptr(ptr)))
+                        return -EFAULT;
+                return do_compat_semctl(first, second, third, pad);
+
+        case MSGSND: {
+                struct compat_msgbuf __user *up = compat_ptr(ptr);
+                compat_long_t type;
+
+                if (first < 0 || second < 0)
+                        return -EINVAL;
 
-        case MSGSND:
-                return compat_sys_msgsnd(first, second, third, compat_ptr(ptr));
-        case MSGRCV:
-                return compat_sys_msgrcv(first, second, fifth, third,
-                                         version, compat_ptr(ptr));
+                if (get_user(type, &up->mtype))
+                        return -EFAULT;
+
+                return do_msgsnd(first, type, up->mtext, second, third);
+        }
+        case MSGRCV: {
+                void __user *uptr = compat_ptr(ptr);
+
+                if (first < 0 || second < 0)
+                        return -EINVAL;
+
+                if (!version) {
+                        struct compat_ipc_kludge ipck;
+                        if (!uptr)
+                                return -EINVAL;
+                        if (copy_from_user (&ipck, uptr, sizeof(ipck)))
+                                return -EFAULT;
+                        uptr = compat_ptr(ipck.msgp);
+                        fifth = ipck.msgtyp;
+                }
+                return do_msgrcv(first, uptr, second, fifth, third,
+                                 compat_do_msg_fill);
+        }
         case MSGGET:
                 return sys_msgget(first, second);
         case MSGCTL:
                 return compat_sys_msgctl(first, second, compat_ptr(ptr));
 
-        case SHMAT:
-                return compat_sys_shmat(first, second, third, version,
-                                        compat_ptr(ptr));
+        case SHMAT: {
+                int err;
+                unsigned long raddr;
+
+                if (version == 1)
+                        return -EINVAL;
+                err = do_shmat(first, compat_ptr(ptr), second, &raddr,
+                               COMPAT_SHMLBA);
+                if (err < 0)
+                        return err;
+                return put_user(raddr, (compat_ulong_t *)compat_ptr(third));
+        }
         case SHMDT:
                 return sys_shmdt(compat_ptr(ptr));
         case SHMGET:
@@ -412,29 +407,30 @@ COMPAT_SYSCALL_DEFINE6(ipc, u32, call, int, first, int, second,
 
         return -ENOSYS;
 }
-#else
-long compat_sys_semctl(int semid, int semnum, int cmd, int arg)
+#endif
+
+COMPAT_SYSCALL_DEFINE4(semctl, int, semid, int, semnum, int, cmd, int, arg)
 {
         return do_compat_semctl(semid, semnum, cmd, arg);
 }
 
-long compat_sys_msgsnd(int msqid, struct compat_msgbuf __user *msgp,
-                       compat_ssize_t msgsz, int msgflg)
+COMPAT_SYSCALL_DEFINE4(msgsnd, int, msqid, compat_uptr_t, msgp,
+                       compat_ssize_t, msgsz, int, msgflg)
 {
+        struct compat_msgbuf __user *up = compat_ptr(msgp);
         compat_long_t mtype;
 
-        if (get_user(mtype, &msgp->mtype))
+        if (get_user(mtype, &up->mtype))
                 return -EFAULT;
-        return do_msgsnd(msqid, mtype, msgp->mtext, (ssize_t)msgsz, msgflg);
+        return do_msgsnd(msqid, mtype, up->mtext, (ssize_t)msgsz, msgflg);
 }
 
-long compat_sys_msgrcv(int msqid, struct compat_msgbuf __user *msgp,
-                       compat_ssize_t msgsz, long msgtyp, int msgflg)
+COMPAT_SYSCALL_DEFINE5(msgrcv, int, msqid, compat_uptr_t, msgp,
+                       compat_ssize_t, msgsz, long, msgtyp, int, msgflg)
 {
-        return do_msgrcv(msqid, msgp, (ssize_t)msgsz, msgtyp, msgflg,
-                         compat_do_msg_fill);
+        return do_msgrcv(msqid, compat_ptr(msgp), (ssize_t)msgsz, msgtyp,
+                         msgflg, compat_do_msg_fill);
 }
-#endif
 
 static inline int get_compat_msqid64(struct msqid64_ds *m64,
                                      struct compat_msqid64_ds __user *up64)
@@ -552,28 +548,7 @@ long compat_sys_msgctl(int first, int second, void __user *uptr)
         return err;
 }
 
-#ifndef COMPAT_SHMLBA
-#define COMPAT_SHMLBA   SHMLBA
-#endif
-
-#ifdef CONFIG_ARCH_WANT_OLD_COMPAT_IPC
-long compat_sys_shmat(int first, int second, compat_uptr_t third, int version,
-                        void __user *uptr)
-{
-        int err;
-        unsigned long raddr;
-        compat_ulong_t __user *uaddr;
-
-        if (version == 1)
-                return -EINVAL;
-        err = do_shmat(first, uptr, second, &raddr, COMPAT_SHMLBA);
-        if (err < 0)
-                return err;
-        uaddr = compat_ptr(third);
-        return put_user(raddr, uaddr);
-}
-#else
-long compat_sys_shmat(int shmid, compat_uptr_t shmaddr, int shmflg)
+COMPAT_SYSCALL_DEFINE3(shmat, int, shmid, compat_uptr_t, shmaddr, int, shmflg)
 {
         unsigned long ret;
         long err;
@@ -584,7 +559,6 @@ long compat_sys_shmat(int shmid, compat_uptr_t shmaddr, int shmflg)
         force_successful_syscall_return();
         return (long)ret;
 }
-#endif
 
 static inline int get_compat_shmid64_ds(struct shmid64_ds *s64,
                                         struct compat_shmid64_ds __user *up64)