msgctl(): move compat to native

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

diff --git a/ipc/compat.c b/ipc/compat.c
index fbfd6fb0a68d2350d7df6fdd4a8a1586737ecb2e..c83099a3b265d0a8ef96c8fb36f3da055e651db6 100644 (file)
--- a/ipc/compat.c
+++ b/ipc/compat.c
@@ -50,22 +50,6 @@ struct compat_semid_ds {
        unsigned short sem_nsems;
 };
 
-struct compat_msqid_ds {
-       struct compat_ipc_perm msg_perm;
-       compat_uptr_t msg_first;
-       compat_uptr_t msg_last;
-       compat_time_t msg_stime;
-       compat_time_t msg_rtime;
-       compat_time_t msg_ctime;
-       compat_ulong_t msg_lcbytes;
-       compat_ulong_t msg_lqbytes;
-       unsigned short msg_cbytes;
-       unsigned short msg_qnum;
-       unsigned short msg_qbytes;
-       compat_ipc_pid_t msg_lspid;
-       compat_ipc_pid_t msg_lrpid;
-};
-
 struct compat_ipc_kludge {
        compat_uptr_t msgp;
        compat_long_t msgtyp;
@@ -391,122 +375,6 @@ COMPAT_SYSCALL_DEFINE5(msgrcv, int, msqid, compat_uptr_t, msgp,
                         msgflg, compat_do_msg_fill);
 }
 
-static inline int get_compat_msqid64(struct msqid64_ds *m64,
-                                    struct compat_msqid64_ds __user *up64)
-{
-       int err;
-
-       if (!access_ok(VERIFY_READ, up64, sizeof(*up64)))
-               return -EFAULT;
-       err  = __get_compat_ipc64_perm(&m64->msg_perm, &up64->msg_perm);
-       err |= __get_user(m64->msg_qbytes, &up64->msg_qbytes);
-       return err;
-}
-
-static inline int get_compat_msqid(struct msqid64_ds *m,
-                                  struct compat_msqid_ds __user *up)
-{
-       int err;
-
-       if (!access_ok(VERIFY_READ, up, sizeof(*up)))
-               return -EFAULT;
-       err  = __get_compat_ipc_perm(&m->msg_perm, &up->msg_perm);
-       err |= __get_user(m->msg_qbytes, &up->msg_qbytes);
-       return err;
-}
-
-static inline int put_compat_msqid64_ds(struct msqid64_ds *m64,
-                                struct compat_msqid64_ds __user *up64)
-{
-       int err;
-
-       if (!access_ok(VERIFY_WRITE, up64, sizeof(*up64)))
-               return -EFAULT;
-       err  = __put_compat_ipc64_perm(&m64->msg_perm, &up64->msg_perm);
-       err |= __put_user(m64->msg_stime, &up64->msg_stime);
-       err |= __put_user(m64->msg_rtime, &up64->msg_rtime);
-       err |= __put_user(m64->msg_ctime, &up64->msg_ctime);
-       err |= __put_user(m64->msg_cbytes, &up64->msg_cbytes);
-       err |= __put_user(m64->msg_qnum, &up64->msg_qnum);
-       err |= __put_user(m64->msg_qbytes, &up64->msg_qbytes);
-       err |= __put_user(m64->msg_lspid, &up64->msg_lspid);
-       err |= __put_user(m64->msg_lrpid, &up64->msg_lrpid);
-       return err;
-}
-
-static inline int put_compat_msqid_ds(struct msqid64_ds *m,
-                                     struct compat_msqid_ds __user *up)
-{
-       int err;
-
-       if (!access_ok(VERIFY_WRITE, up, sizeof(*up)))
-               return -EFAULT;
-       err  = __put_compat_ipc_perm(&m->msg_perm, &up->msg_perm);
-       err |= __put_user(m->msg_stime, &up->msg_stime);
-       err |= __put_user(m->msg_rtime, &up->msg_rtime);
-       err |= __put_user(m->msg_ctime, &up->msg_ctime);
-       err |= __put_user(m->msg_cbytes, &up->msg_cbytes);
-       err |= __put_user(m->msg_qnum, &up->msg_qnum);
-       err |= __put_user(m->msg_qbytes, &up->msg_qbytes);
-       err |= __put_user(m->msg_lspid, &up->msg_lspid);
-       err |= __put_user(m->msg_lrpid, &up->msg_lrpid);
-       return err;
-}
-
-COMPAT_SYSCALL_DEFINE3(msgctl, int, first, int, second, void __user *, uptr)
-{
-       int err, err2;
-       struct msqid64_ds m64;
-       int version = __compat_ipc_parse_version(&second);
-       void __user *p;
-
-       memset(&m64, 0, sizeof(m64));
-
-       switch (second & (~IPC_64)) {
-       case IPC_INFO:
-       case IPC_RMID:
-       case MSG_INFO:
-               err = sys_msgctl(first, second, uptr);
-               break;
-
-       case IPC_SET:
-               if (version == IPC_64)
-                       err = get_compat_msqid64(&m64, uptr);
-               else
-                       err = get_compat_msqid(&m64, uptr);
-
-               if (err)
-                       break;
-               p = compat_alloc_user_space(sizeof(m64));
-               if (copy_to_user(p, &m64, sizeof(m64)))
-                       err = -EFAULT;
-               else
-                       err = sys_msgctl(first, second, p);
-               break;
-
-       case IPC_STAT:
-       case MSG_STAT:
-               p = compat_alloc_user_space(sizeof(m64));
-               err = sys_msgctl(first, second, p);
-               if (err < 0)
-                       break;
-               if (copy_from_user(&m64, p, sizeof(m64)))
-                       err2 = -EFAULT;
-               else if (version == IPC_64)
-                       err2 = put_compat_msqid64_ds(&m64, uptr);
-               else
-                       err2 = put_compat_msqid_ds(&m64, uptr);
-               if (err2)
-                       err = -EFAULT;
-               break;
-
-       default:
-               err = -EINVAL;
-               break;
-       }
-       return err;
-}
-
 COMPAT_SYSCALL_DEFINE3(shmat, int, shmid, compat_uptr_t, shmaddr, int, shmflg)
 {
        unsigned long ret;

diff --git a/ipc/msg.c b/ipc/msg.c
index 322e7bf8b8d1795d5e44a585d6ee5a6e80325549..3400012e1ce8bc804e4318e7fe58ddd357471d23 100644 (file)
--- a/ipc/msg.c
+++ b/ipc/msg.c
@@ -567,6 +567,139 @@ SYSCALL_DEFINE3(msgctl, int, msqid, int, cmd, struct msqid_ds __user *, buf)
        }
 }
 
+#ifdef CONFIG_COMPAT
+
+struct compat_msqid_ds {
+       struct compat_ipc_perm msg_perm;
+       compat_uptr_t msg_first;
+       compat_uptr_t msg_last;
+       compat_time_t msg_stime;
+       compat_time_t msg_rtime;
+       compat_time_t msg_ctime;
+       compat_ulong_t msg_lcbytes;
+       compat_ulong_t msg_lqbytes;
+       unsigned short msg_cbytes;
+       unsigned short msg_qnum;
+       unsigned short msg_qbytes;
+       compat_ipc_pid_t msg_lspid;
+       compat_ipc_pid_t msg_lrpid;
+};
+
+static int copy_compat_msqid_from_user(struct msqid64_ds *out, void __user *buf,
+                                       int version)
+{
+       memset(out, 0, sizeof(*out));
+       if (version == IPC_64) {
+               struct compat_msqid64_ds *p = buf;
+               struct compat_ipc64_perm v;
+               if (copy_from_user(&v, &p->msg_perm, sizeof(v)))
+                       return -EFAULT;
+               out->msg_perm.uid = v.uid;
+               out->msg_perm.gid = v.gid;
+               out->msg_perm.mode = v.mode;
+               if (get_user(out->msg_qbytes, &p->msg_qbytes))
+                       return -EFAULT;
+       } else {
+               struct compat_msqid_ds *p = buf;
+               struct compat_ipc_perm v;
+               if (copy_from_user(&v, &p->msg_perm, sizeof(v)))
+                       return -EFAULT;
+               out->msg_perm.uid = v.uid;
+               out->msg_perm.gid = v.gid;
+               out->msg_perm.mode = v.mode;
+               if (get_user(out->msg_qbytes, &p->msg_qbytes))
+                       return -EFAULT;
+       }
+       return 0;
+}
+
+static int copy_compat_msqid_to_user(void __user *buf, struct msqid64_ds *in,
+                                       int version)
+{
+       if (version == IPC_64) {
+               struct compat_msqid64_ds v;
+               memset(&v, 0, sizeof(v));
+               v.msg_perm.key = in->msg_perm.key;
+               v.msg_perm.uid = in->msg_perm.uid;
+               v.msg_perm.gid = in->msg_perm.gid;
+               v.msg_perm.cuid = in->msg_perm.cuid;
+               v.msg_perm.cgid = in->msg_perm.cgid;
+               v.msg_perm.mode = in->msg_perm.mode;
+               v.msg_perm.seq = in->msg_perm.seq;
+               v.msg_stime = in->msg_stime;
+               v.msg_rtime = in->msg_rtime;
+               v.msg_ctime = in->msg_ctime;
+               v.msg_cbytes = in->msg_cbytes;
+               v.msg_qnum = in->msg_qnum;
+               v.msg_qbytes = in->msg_qbytes;
+               v.msg_lspid = in->msg_lspid;
+               v.msg_lrpid = in->msg_lrpid;
+               return copy_to_user(buf, &v, sizeof(v));
+       } else {
+               struct compat_msqid_ds v;
+               memset(&v, 0, sizeof(v));
+               v.msg_perm.key = in->msg_perm.key;
+               SET_UID(v.msg_perm.uid, in->msg_perm.uid);
+               SET_GID(v.msg_perm.gid, in->msg_perm.gid);
+               SET_UID(v.msg_perm.cuid, in->msg_perm.cuid);
+               SET_GID(v.msg_perm.cgid, in->msg_perm.cgid);
+               v.msg_perm.mode = in->msg_perm.mode;
+               v.msg_perm.seq = in->msg_perm.seq;
+               v.msg_stime = in->msg_stime;
+               v.msg_rtime = in->msg_rtime;
+               v.msg_ctime = in->msg_ctime;
+               v.msg_cbytes = in->msg_cbytes;
+               v.msg_qnum = in->msg_qnum;
+               v.msg_qbytes = in->msg_qbytes;
+               v.msg_lspid = in->msg_lspid;
+               v.msg_lrpid = in->msg_lrpid;
+               return copy_to_user(buf, &v, sizeof(v));
+       }
+}
+
+COMPAT_SYSCALL_DEFINE3(msgctl, int, msqid, int, cmd, void __user *, uptr)
+{
+       struct ipc_namespace *ns;
+       int err;
+       struct msqid64_ds msqid64;
+       int version = compat_ipc_parse_version(&cmd);
+
+       ns = current->nsproxy->ipc_ns;
+
+       if (msqid < 0 || cmd < 0)
+               return -EINVAL;
+
+       switch (cmd & (~IPC_64)) {
+       case IPC_INFO:
+       case MSG_INFO: {
+               struct msginfo msginfo;
+               err = msgctl_info(ns, msqid, cmd, &msginfo);
+               if (err < 0)
+                       return err;
+               if (copy_to_user(uptr, &msginfo, sizeof(struct msginfo)))
+                       err = -EFAULT;
+               return err;
+       }
+       case IPC_STAT:
+       case MSG_STAT:
+               err = msgctl_stat(ns, msqid, cmd, &msqid64);
+               if (err < 0)
+                       return err;
+               if (copy_compat_msqid_to_user(uptr, &msqid64, version))
+                       err = -EFAULT;
+               return err;
+       case IPC_SET:
+               if (copy_compat_msqid_from_user(&msqid64, uptr, version))
+                       return -EFAULT;
+               /* fallthru */
+       case IPC_RMID:
+               return msgctl_down(ns, msqid, cmd, &msqid64);
+       default:
+               return -EINVAL;
+       }
+}
+#endif
+
 static int testmsg(struct msg_msg *msg, long type, int mode)
 {
        switch (mode) {