From: Arnd Bergmann <arnd@arndb.de>
Convert the x86_64 system call emulation code to use the new System-V IPC
compat code
---
arch/x86_64/Kconfig | 4
arch/x86_64/ia32/ipc32.c | 675 +-------------------------------------------
include/asm-x86_64/compat.h | 59 +++
3 files changed, 82 insertions(+), 656 deletions(-)
diff -puN arch/x86_64/ia32/ipc32.c~compat-generic-ipc-emulation-x86_64 arch/x86_64/ia32/ipc32.c
--- 25/arch/x86_64/ia32/ipc32.c~compat-generic-ipc-emulation-x86_64 2004-02-20 23:35:02.000000000 -0800
+++ 25-akpm/arch/x86_64/ia32/ipc32.c 2004-02-20 23:36:42.000000000 -0800
@@ -1,656 +1,19 @@
#include <linux/kernel.h>
-#include <linux/sched.h>
-#include <linux/fs.h>
-#include <linux/file.h>
+#include <linux/spinlock.h>
+#include <linux/list.h>
#include <linux/syscalls.h>
+#include <linux/time.h>
#include <linux/sem.h>
#include <linux/msg.h>
-#include <linux/mm.h>
#include <linux/shm.h>
-#include <linux/slab.h>
#include <linux/ipc.h>
#include <linux/compat.h>
-#include <asm/mman.h>
-#include <asm/types.h>
-#include <asm/uaccess.h>
-#include <asm/semaphore.h>
-#include <asm/ipc.h>
-
-#include <asm/ia32.h>
-
-/*
- * sys32_ipc() is the de-multiplexer for the SysV IPC calls in 32bit emulation..
- *
- * This is really horribly ugly.
- */
-
-struct msgbuf32 {
- s32 mtype;
- char mtext[1];
-};
-
-struct ipc_perm32 {
- int key;
- compat_uid_t uid;
- compat_gid_t gid;
- compat_uid_t cuid;
- compat_gid_t cgid;
- unsigned short mode;
- unsigned short seq;
-};
-
-struct ipc64_perm32 {
- unsigned key;
- compat_uid32_t uid;
- compat_gid32_t gid;
- compat_uid32_t cuid;
- compat_gid32_t cgid;
- unsigned short mode;
- unsigned short __pad1;
- unsigned short seq;
- unsigned short __pad2;
- unsigned int unused1;
- unsigned int unused2;
-};
-
-struct semid_ds32 {
- struct ipc_perm32 sem_perm; /* permissions .. see ipc.h */
- compat_time_t sem_otime; /* last semop time */
- compat_time_t sem_ctime; /* last change time */
- u32 sem_base; /* ptr to first semaphore in array */
- u32 sem_pending; /* pending operations to be processed */
- u32 sem_pending_last; /* last pending operation */
- u32 undo; /* undo requests on this array */
- unsigned short sem_nsems; /* no. of semaphores in array */
-};
-
-struct semid64_ds32 {
- struct ipc64_perm32 sem_perm;
- compat_time_t sem_otime;
- unsigned int __unused1;
- compat_time_t sem_ctime;
- unsigned int __unused2;
- unsigned int sem_nsems;
- unsigned int __unused3;
- unsigned int __unused4;
-};
-
-struct msqid_ds32 {
- struct ipc_perm32 msg_perm;
- u32 msg_first;
- u32 msg_last;
- compat_time_t msg_stime;
- compat_time_t msg_rtime;
- compat_time_t msg_ctime;
- u32 wwait;
- u32 rwait;
- 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 msqid64_ds32 {
- struct ipc64_perm32 msg_perm;
- compat_time_t msg_stime;
- unsigned int __unused1;
- compat_time_t msg_rtime;
- unsigned int __unused2;
- compat_time_t msg_ctime;
- unsigned int __unused3;
- unsigned int msg_cbytes;
- unsigned int msg_qnum;
- unsigned int msg_qbytes;
- compat_pid_t msg_lspid;
- compat_pid_t msg_lrpid;
- unsigned int __unused4;
- unsigned int __unused5;
-};
-
-struct shmid_ds32 {
- struct ipc_perm32 shm_perm;
- int shm_segsz;
- compat_time_t shm_atime;
- compat_time_t shm_dtime;
- compat_time_t shm_ctime;
- compat_ipc_pid_t shm_cpid;
- compat_ipc_pid_t shm_lpid;
- unsigned short shm_nattch;
-};
-
-struct shmid64_ds32 {
- struct ipc64_perm32 shm_perm;
- compat_size_t shm_segsz;
- compat_time_t shm_atime;
- unsigned int __unused1;
- compat_time_t shm_dtime;
- unsigned int __unused2;
- compat_time_t shm_ctime;
- unsigned int __unused3;
- compat_pid_t shm_cpid;
- compat_pid_t shm_lpid;
- unsigned int shm_nattch;
- unsigned int __unused4;
- unsigned int __unused5;
-};
-
-struct shminfo64_32 {
- unsigned int shmmax;
- unsigned int shmmin;
- unsigned int shmmni;
- unsigned int shmseg;
- unsigned int shmall;
- unsigned int __unused1;
- unsigned int __unused2;
- unsigned int __unused3;
- unsigned int __unused4;
-};
-
-struct shm_info32 {
- int used_ids;
- u32 shm_tot, shm_rss, shm_swp;
- u32 swap_attempts, swap_successes;
-};
-
-struct ipc_kludge {
- u32 msgp;
- s32 msgtyp;
-};
-
-
-#define A(__x) ((unsigned long)(__x))
-#define AA(__x) ((unsigned long)(__x))
-
-#define SEMOP 1
-#define SEMGET 2
-#define SEMCTL 3
-#define TIMEDSEMOP 4
-#define MSGSND 11
-#define MSGRCV 12
-#define MSGGET 13
-#define MSGCTL 14
-#define SHMAT 21
-#define SHMDT 22
-#define SHMGET 23
-#define SHMCTL 24
-
-#define IPCOP_MASK(__x) (1UL << (__x))
-
-static int
-ipc_parse_version32 (int *cmd)
-{
- if (*cmd & IPC_64) {
- *cmd ^= IPC_64;
- return IPC_64;
- } else {
- return IPC_OLD;
- }
-}
-
-static int put_semid(void *user_semid, struct semid64_ds *s, int version)
-{
- int err2;
- switch (version) {
- case IPC_64: {
- struct semid64_ds32 *usp64 = (struct semid64_ds32 *) user_semid;
-
- if (!access_ok(VERIFY_WRITE, usp64, sizeof(*usp64))) {
- err2 = -EFAULT;
- break;
- }
- err2 = __put_user(s->sem_perm.key, &usp64->sem_perm.key);
- err2 |= __put_user(s->sem_perm.uid, &usp64->sem_perm.uid);
- err2 |= __put_user(s->sem_perm.gid, &usp64->sem_perm.gid);
- err2 |= __put_user(s->sem_perm.cuid, &usp64->sem_perm.cuid);
- err2 |= __put_user(s->sem_perm.cgid, &usp64->sem_perm.cgid);
- err2 |= __put_user(s->sem_perm.mode, &usp64->sem_perm.mode);
- err2 |= __put_user(s->sem_perm.seq, &usp64->sem_perm.seq);
- err2 |= __put_user(s->sem_otime, &usp64->sem_otime);
- err2 |= __put_user(s->sem_ctime, &usp64->sem_ctime);
- err2 |= __put_user(s->sem_nsems, &usp64->sem_nsems);
- break;
- }
- default: {
- struct semid_ds32 *usp32 = (struct semid_ds32 *) user_semid;
-
- if (!access_ok(VERIFY_WRITE, usp32, sizeof(*usp32))) {
- err2 = -EFAULT;
- break;
- }
- err2 = __put_user(s->sem_perm.key, &usp32->sem_perm.key);
- err2 |= __put_user(s->sem_perm.uid, &usp32->sem_perm.uid);
- err2 |= __put_user(s->sem_perm.gid, &usp32->sem_perm.gid);
- err2 |= __put_user(s->sem_perm.cuid, &usp32->sem_perm.cuid);
- err2 |= __put_user(s->sem_perm.cgid, &usp32->sem_perm.cgid);
- err2 |= __put_user(s->sem_perm.mode, &usp32->sem_perm.mode);
- err2 |= __put_user(s->sem_perm.seq, &usp32->sem_perm.seq);
- err2 |= __put_user(s->sem_otime, &usp32->sem_otime);
- err2 |= __put_user(s->sem_ctime, &usp32->sem_ctime);
- err2 |= __put_user(s->sem_nsems, &usp32->sem_nsems);
- break;
- }
- }
- return err2;
-}
-
-static int
-semctl32 (int first, int second, int third, void *uptr)
-{
- union semun fourth;
- u32 pad;
- int err;
- struct semid64_ds s;
- mm_segment_t old_fs;
- int version = ipc_parse_version32(&third);
-
- if (!uptr)
- return -EINVAL;
- if (get_user(pad, (u32 *)uptr))
- return -EFAULT;
- if (third == SETVAL)
- fourth.val = (int)pad;
- else
- fourth.__pad = (void *)A(pad);
- switch (third) {
- case IPC_INFO:
- case IPC_RMID:
- case IPC_SET:
- case SEM_INFO:
- case GETVAL:
- case GETPID:
- case GETNCNT:
- case GETZCNT:
- case GETALL:
- case SETVAL:
- case SETALL:
- err = sys_semctl(first, second, third, fourth);
- break;
-
- case IPC_STAT:
- case SEM_STAT:
- fourth.__pad = &s;
- old_fs = get_fs();
- set_fs(KERNEL_DS);
- err = sys_semctl(first, second, third, fourth);
- set_fs(old_fs);
- if (!err)
- err = put_semid((void *)A(pad), &s, version);
- break;
- default:
- err = -EINVAL;
- break;
- }
- return err;
-}
-
-#define MAXBUF (64*1024)
-
-static int
-do_sys32_msgsnd (int first, int second, int third, void *uptr)
-{
- struct msgbuf *p;
- struct msgbuf32 *up = (struct msgbuf32 *)uptr;
- mm_segment_t old_fs;
- int err;
-
- if (second >= MAXBUF-sizeof(struct msgbuf))
- return -EINVAL;
- p = kmalloc(second + sizeof(struct msgbuf), GFP_USER);
- if (!p)
- return -ENOMEM;
- err = get_user(p->mtype, &up->mtype);
- err |= (copy_from_user(p->mtext, &up->mtext, second) ? -EFAULT : 0);
- if (err)
- goto out;
- old_fs = get_fs();
- set_fs(KERNEL_DS);
- err = sys_msgsnd(first, p, second, third);
- set_fs(old_fs);
- out:
- kfree(p);
- return err;
-}
-
-static int
-do_sys32_msgrcv (int first, int second, int msgtyp, int third, int version, void *uptr)
-{
- struct msgbuf32 *up;
- struct msgbuf *p;
- mm_segment_t old_fs;
- int err;
-
- if (!version) {
- struct ipc_kludge *uipck = (struct ipc_kludge *)uptr;
- struct ipc_kludge ipck;
-
- err = -EINVAL;
- if (!uptr)
- goto out;
- err = -EFAULT;
- if (copy_from_user(&ipck, uipck, sizeof(struct ipc_kludge)))
- goto out;
- uptr = (void *)A(ipck.msgp);
- msgtyp = ipck.msgtyp;
- }
- if (second >= MAXBUF-sizeof(struct msgbuf))
- return -EINVAL;
- err = -ENOMEM;
- p = kmalloc(second + sizeof(struct msgbuf), GFP_USER);
- if (!p)
- goto out;
- old_fs = get_fs();
- set_fs(KERNEL_DS);
- err = sys_msgrcv(first, p, second, msgtyp, third);
- set_fs(old_fs);
- if (err < 0)
- goto free_then_out;
- up = (struct msgbuf32 *)uptr;
- if (put_user(p->mtype, &up->mtype) || copy_to_user(&up->mtext, p->mtext, err))
- err = -EFAULT;
-free_then_out:
- kfree(p);
-out:
- return err;
-}
-
-
-static int
-msgctl32 (int first, int second, void *uptr)
-{
- int err = -EINVAL, err2;
- struct msqid_ds m;
- struct msqid64_ds m64;
- struct msqid_ds32 *up32 = (struct msqid_ds32 *)uptr;
- struct msqid64_ds32 *up64 = (struct msqid64_ds32 *)uptr;
- mm_segment_t old_fs;
- int version = ipc_parse_version32(&second);
-
- switch (second) {
- case IPC_INFO:
- case IPC_RMID:
- case MSG_INFO:
- err = sys_msgctl(first, second, (struct msqid_ds *)uptr);
- break;
-
- case IPC_SET:
- if (version == IPC_64) {
- err = get_user(m.msg_perm.uid, &up64->msg_perm.uid);
- err |= get_user(m.msg_perm.gid, &up64->msg_perm.gid);
- err |= get_user(m.msg_perm.mode, &up64->msg_perm.mode);
- err |= get_user(m.msg_qbytes, &up64->msg_qbytes);
- } else {
- err = get_user(m.msg_perm.uid, &up32->msg_perm.uid);
- err |= get_user(m.msg_perm.gid, &up32->msg_perm.gid);
- err |= get_user(m.msg_perm.mode, &up32->msg_perm.mode);
- err |= get_user(m.msg_qbytes, &up32->msg_qbytes);
- }
- if (err)
- break;
- old_fs = get_fs();
- set_fs(KERNEL_DS);
- err = sys_msgctl(first, second, &m);
- set_fs(old_fs);
- break;
-
- case IPC_STAT:
- case MSG_STAT:
- old_fs = get_fs();
- set_fs(KERNEL_DS);
- err = sys_msgctl(first, second, (void *) &m64);
- set_fs(old_fs);
- if (version == IPC_64) {
- if (!access_ok(VERIFY_WRITE, up64, sizeof(*up64))) {
- err = -EFAULT;
- break;
- }
- err2 = __put_user(m64.msg_perm.key, &up64->msg_perm.key);
- err2 |= __put_user(m64.msg_perm.uid, &up64->msg_perm.uid);
- err2 |= __put_user(m64.msg_perm.gid, &up64->msg_perm.gid);
- err2 |= __put_user(m64.msg_perm.cuid, &up64->msg_perm.cuid);
- err2 |= __put_user(m64.msg_perm.cgid, &up64->msg_perm.cgid);
- err2 |= __put_user(m64.msg_perm.mode, &up64->msg_perm.mode);
- err2 |= __put_user(m64.msg_perm.seq, &up64->msg_perm.seq);
- err2 |= __put_user(m64.msg_stime, &up64->msg_stime);
- err2 |= __put_user(m64.msg_rtime, &up64->msg_rtime);
- err2 |= __put_user(m64.msg_ctime, &up64->msg_ctime);
- err2 |= __put_user(m64.msg_cbytes, &up64->msg_cbytes);
- err2 |= __put_user(m64.msg_qnum, &up64->msg_qnum);
- err2 |= __put_user(m64.msg_qbytes, &up64->msg_qbytes);
- err2 |= __put_user(m64.msg_lspid, &up64->msg_lspid);
- err2 |= __put_user(m64.msg_lrpid, &up64->msg_lrpid);
- if (err2)
- err = -EFAULT;
- } else {
- if (!access_ok(VERIFY_WRITE, up32, sizeof(*up32))) {
- err = -EFAULT;
- break;
- }
- err2 = __put_user(m64.msg_perm.key, &up32->msg_perm.key);
- err2 |= __put_user(m64.msg_perm.uid, &up32->msg_perm.uid);
- err2 |= __put_user(m64.msg_perm.gid, &up32->msg_perm.gid);
- err2 |= __put_user(m64.msg_perm.cuid, &up32->msg_perm.cuid);
- err2 |= __put_user(m64.msg_perm.cgid, &up32->msg_perm.cgid);
- err2 |= __put_user(m64.msg_perm.mode, &up32->msg_perm.mode);
- err2 |= __put_user(m64.msg_perm.seq, &up32->msg_perm.seq);
- err2 |= __put_user(m64.msg_stime, &up32->msg_stime);
- err2 |= __put_user(m64.msg_rtime, &up32->msg_rtime);
- err2 |= __put_user(m64.msg_ctime, &up32->msg_ctime);
- err2 |= __put_user(m64.msg_cbytes, &up32->msg_cbytes);
- err2 |= __put_user(m64.msg_qnum, &up32->msg_qnum);
- err2 |= __put_user(m64.msg_qbytes, &up32->msg_qbytes);
- err2 |= __put_user(m64.msg_lspid, &up32->msg_lspid);
- err2 |= __put_user(m64.msg_lrpid, &up32->msg_lrpid);
- if (err2)
- err = -EFAULT;
- }
- break;
- }
- return err;
-}
-
-static int
-shmat32 (int first, int second, int third, int version, void *uptr)
-{
- unsigned long raddr;
- u32 *uaddr = (u32 *)A((u32)third);
- int err;
-
- if (version == 1)
- return -EINVAL; /* iBCS2 emulator entry point: unsupported */
- err = sys_shmat(first, uptr, second, &raddr);
- if (err)
- return err;
- return put_user(raddr, uaddr);
-}
-
-static int put_shmid64(struct shmid64_ds *s64p, void *uptr, int version)
-{
- int err2;
-#define s64 (*s64p)
- if (version == IPC_64) {
- struct shmid64_ds32 *up64 = (struct shmid64_ds32 *)uptr;
-
- if (!access_ok(VERIFY_WRITE, up64, sizeof(*up64)))
- return -EFAULT;
-
- err2 = __put_user(s64.shm_perm.key, &up64->shm_perm.key);
- err2 |= __put_user(s64.shm_perm.uid, &up64->shm_perm.uid);
- err2 |= __put_user(s64.shm_perm.gid, &up64->shm_perm.gid);
- err2 |= __put_user(s64.shm_perm.cuid, &up64->shm_perm.cuid);
- err2 |= __put_user(s64.shm_perm.cgid, &up64->shm_perm.cgid);
- err2 |= __put_user(s64.shm_perm.mode, &up64->shm_perm.mode);
- err2 |= __put_user(s64.shm_perm.seq, &up64->shm_perm.seq);
- err2 |= __put_user(s64.shm_atime, &up64->shm_atime);
- err2 |= __put_user(s64.shm_dtime, &up64->shm_dtime);
- err2 |= __put_user(s64.shm_ctime, &up64->shm_ctime);
- err2 |= __put_user(s64.shm_segsz, &up64->shm_segsz);
- err2 |= __put_user(s64.shm_nattch, &up64->shm_nattch);
- err2 |= __put_user(s64.shm_cpid, &up64->shm_cpid);
- err2 |= __put_user(s64.shm_lpid, &up64->shm_lpid);
- } else {
- struct shmid_ds32 *up32 = (struct shmid_ds32 *)uptr;
-
- if (!access_ok(VERIFY_WRITE, up32, sizeof(*up32)))
- return -EFAULT;
-
- err2 = __put_user(s64.shm_perm.key, &up32->shm_perm.key);
- err2 |= __put_user(s64.shm_perm.uid, &up32->shm_perm.uid);
- err2 |= __put_user(s64.shm_perm.gid, &up32->shm_perm.gid);
- err2 |= __put_user(s64.shm_perm.cuid, &up32->shm_perm.cuid);
- err2 |= __put_user(s64.shm_perm.cgid, &up32->shm_perm.cgid);
- err2 |= __put_user(s64.shm_perm.mode, &up32->shm_perm.mode);
- err2 |= __put_user(s64.shm_perm.seq, &up32->shm_perm.seq);
- err2 |= __put_user(s64.shm_atime, &up32->shm_atime);
- err2 |= __put_user(s64.shm_dtime, &up32->shm_dtime);
- err2 |= __put_user(s64.shm_ctime, &up32->shm_ctime);
- err2 |= __put_user(s64.shm_segsz, &up32->shm_segsz);
- err2 |= __put_user(s64.shm_nattch, &up32->shm_nattch);
- err2 |= __put_user(s64.shm_cpid, &up32->shm_cpid);
- err2 |= __put_user(s64.shm_lpid, &up32->shm_lpid);
- }
-#undef s64
- return err2 ? -EFAULT : 0;
-}
-static int
-shmctl32 (int first, int second, void *uptr)
-{
- int err = -EFAULT, err2;
- struct shmid_ds s;
- struct shmid64_ds s64;
- mm_segment_t old_fs;
- struct shm_info32 *uip = (struct shm_info32 *)uptr;
- struct shm_info si;
- int version = ipc_parse_version32(&second);
- struct shminfo64 smi;
- struct shminfo *usi32 = (struct shminfo *) uptr;
- struct shminfo64_32 *usi64 = (struct shminfo64_32 *) uptr;
-
- switch (second) {
- case IPC_INFO:
- old_fs = get_fs();
- set_fs(KERNEL_DS);
- err = sys_shmctl(first, second, (struct shmid_ds *)&smi);
- set_fs(old_fs);
-
- if (version == IPC_64) {
- if (!access_ok(VERIFY_WRITE, usi64, sizeof(*usi64))) {
- err = -EFAULT;
- break;
- }
- err2 = __put_user(smi.shmmax, &usi64->shmmax);
- err2 |= __put_user(smi.shmmin, &usi64->shmmin);
- err2 |= __put_user(smi.shmmni, &usi64->shmmni);
- err2 |= __put_user(smi.shmseg, &usi64->shmseg);
- err2 |= __put_user(smi.shmall, &usi64->shmall);
- } else {
- if (!access_ok(VERIFY_WRITE, usi32, sizeof(*usi32))) {
- err = -EFAULT;
- break;
- }
- err2 = __put_user(smi.shmmax, &usi32->shmmax);
- err2 |= __put_user(smi.shmmin, &usi32->shmmin);
- err2 |= __put_user(smi.shmmni, &usi32->shmmni);
- err2 |= __put_user(smi.shmseg, &usi32->shmseg);
- err2 |= __put_user(smi.shmall, &usi32->shmall);
- }
- if (err2)
- err = -EFAULT;
- break;
-
- case IPC_RMID:
- case SHM_LOCK:
- case SHM_UNLOCK:
- err = sys_shmctl(first, second, (struct shmid_ds *)uptr);
- break;
-
- case IPC_SET:
- if (version == IPC_64) {
- struct shmid64_ds32 *up64 = (struct shmid64_ds32 *)uptr;
- err = get_user(s.shm_perm.uid, &up64->shm_perm.uid);
- err |= get_user(s.shm_perm.gid, &up64->shm_perm.gid);
- err |= get_user(s.shm_perm.mode, &up64->shm_perm.mode);
- } else {
- struct shmid_ds32 *up32 = (struct shmid_ds32 *)uptr;
- err = get_user(s.shm_perm.uid, &up32->shm_perm.uid);
- err |= get_user(s.shm_perm.gid, &up32->shm_perm.gid);
- err |= get_user(s.shm_perm.mode, &up32->shm_perm.mode);
- }
- if (err)
- break;
- old_fs = get_fs();
- set_fs(KERNEL_DS);
- err = sys_shmctl(first, second, &s);
- set_fs(old_fs);
- break;
-
- case IPC_STAT:
- case SHM_STAT:
- old_fs = get_fs();
- set_fs(KERNEL_DS);
- err = sys_shmctl(first, second, (void *) &s64);
- set_fs(old_fs);
-
- if (err < 0)
- break;
- err2 = put_shmid64(&s64, uptr, version);
- if (err2)
- err = err2;
- break;
-
- case SHM_INFO:
- old_fs = get_fs();
- set_fs(KERNEL_DS);
- err = sys_shmctl(first, second, (void *)&si);
- set_fs(old_fs);
- if (err < 0)
- break;
-
- if (!access_ok(VERIFY_WRITE, uip, sizeof(*uip))) {
- err = -EFAULT;
- break;
- }
- err2 = __put_user(si.used_ids, &uip->used_ids);
- err2 |= __put_user(si.shm_tot, &uip->shm_tot);
- err2 |= __put_user(si.shm_rss, &uip->shm_rss);
- err2 |= __put_user(si.shm_swp, &uip->shm_swp);
- err2 |= __put_user(si.swap_attempts, &uip->swap_attempts);
- err2 |= __put_user(si.swap_successes, &uip->swap_successes);
- if (err2)
- err = -EFAULT;
- break;
- default:
- err = -EINVAL;
- break;
- }
- return err;
-}
-
-extern int sem_ctls[];
-
-static long semtimedop32(int semid, struct sembuf *sb,
- unsigned nsops, struct compat_timespec *ts32)
-{
- struct timespec ts;
- mm_segment_t oldfs = get_fs();
- long ret;
-
- if (nsops > sem_ctls[2])
- return -E2BIG;
- if (!access_ok(VERIFY_READ, sb, nsops * sizeof(struct sembuf)))
- return -EFAULT;
- if (ts32 && get_compat_timespec(&ts, ts32))
- return -EFAULT;
-
- set_fs(KERNEL_DS);
- ret = sys_semtimedop(semid, sb, nsops, ts32 ? &ts : NULL);
- set_fs(oldfs);
- return ret;
-}
+#include <asm-i386/ipc.h>
asmlinkage long
-sys32_ipc (u32 call, int first, int second, int third, u32 ptr, u32 fifth)
+sys32_ipc(u32 call, int first, int second, int third,
+ compat_uptr_t ptr, u32 fifth)
{
int version;
@@ -660,35 +23,35 @@ sys32_ipc (u32 call, int first, int seco
switch (call) {
case SEMOP:
/* struct sembuf is the same on 32 and 64bit :)) */
- return sys_semtimedop(first, (struct sembuf *)AA(ptr), second,
- NULL);
- case TIMEDSEMOP:
- return semtimedop32(first, (struct sembuf *)AA(ptr), second,
- (struct compat_timespec *)AA(fifth));
+ return sys_semtimedop(first, compat_ptr(ptr), second, NULL);
+ case SEMTIMEDOP:
+ return compat_sys_semtimedop(first, compat_ptr(ptr), second,
+ compat_ptr(fifth));
case SEMGET:
return sys_semget(first, second, third);
case SEMCTL:
- return semctl32(first, second, third, (void *)AA(ptr));
+ return compat_sys_semctl(first, second, third, compat_ptr(ptr));
case MSGSND:
- return do_sys32_msgsnd(first, second, third, (void *)AA(ptr));
+ return compat_sys_msgsnd(first, second, third, compat_ptr(ptr));
case MSGRCV:
- return do_sys32_msgrcv(first, second, fifth, third, version, (void *)AA(ptr));
+ return compat_sys_msgrcv(first, second, fifth, third,
+ version, compat_ptr(ptr));
case MSGGET:
return sys_msgget((key_t) first, second);
case MSGCTL:
- return msgctl32(first, second, (void *)AA(ptr));
+ return compat_sys_msgctl(first, second, compat_ptr(ptr));
case SHMAT:
- return shmat32(first, second, third, version, (void *)AA(ptr));
+ return compat_sys_shmat(first, second, third, version,
+ compat_ptr(ptr));
break;
case SHMDT:
- return sys_shmdt((char *)AA(ptr));
+ return sys_shmdt(compat_ptr(ptr));
case SHMGET:
return sys_shmget(first, second, third);
case SHMCTL:
- return shmctl32(first, second, (void *)AA(ptr));
+ return compat_sys_shmctl(first, second, compat_ptr(ptr));
}
return -ENOSYS;
}
-
diff -puN arch/x86_64/Kconfig~compat-generic-ipc-emulation-x86_64 arch/x86_64/Kconfig
--- 25/arch/x86_64/Kconfig~compat-generic-ipc-emulation-x86_64 2004-02-20 23:35:02.000000000 -0800
+++ 25-akpm/arch/x86_64/Kconfig 2004-02-20 23:35:02.000000000 -0800
@@ -377,6 +377,10 @@ config COMPAT
depends on IA32_EMULATION
default y
+config SYSVIPC_COMPAT
+ bool
+ depends on COMPAT && SYSVIPC
+ default y
config UID16
bool
diff -puN include/asm-x86_64/compat.h~compat-generic-ipc-emulation-x86_64 include/asm-x86_64/compat.h
--- 25/include/asm-x86_64/compat.h~compat-generic-ipc-emulation-x86_64 2004-02-20 23:35:02.000000000 -0800
+++ 25-akpm/include/asm-x86_64/compat.h 2004-02-20 23:37:01.000000000 -0800
@@ -29,6 +29,7 @@ typedef s32 compat_daddr_t;
typedef u32 compat_caddr_t;
typedef __kernel_fsid_t compat_fsid_t;
typedef u32 compat_timer_t;
+typedef s32 compat_key_t;
typedef s32 compat_int_t;
typedef s32 compat_long_t;
@@ -119,6 +120,64 @@ typedef u32 compat_sigset_
#define COMPAT_OFF_T_MAX 0x7fffffff
#define COMPAT_LOFF_T_MAX 0x7fffffffffffffff
+struct compat_ipc64_perm {
+ compat_key_t key;
+ compat_uid32_t uid;
+ compat_gid32_t gid;
+ compat_uid32_t cuid;
+ compat_gid32_t cgid;
+ unsigned short mode;
+ unsigned short __pad1;
+ unsigned short seq;
+ unsigned short __pad2;
+ compat_ulong_t unused1;
+ compat_ulong_t unused2;
+};
+
+struct compat_semid64_ds {
+ struct compat_ipc64_perm sem_perm;
+ compat_time_t sem_otime;
+ compat_ulong_t __unused1;
+ compat_time_t sem_ctime;
+ compat_ulong_t __unused2;
+ compat_ulong_t sem_nsems;
+ compat_ulong_t __unused3;
+ compat_ulong_t __unused4;
+};
+
+struct compat_msqid64_ds {
+ struct compat_ipc64_perm msg_perm;
+ compat_time_t msg_stime;
+ compat_ulong_t __unused1;
+ compat_time_t msg_rtime;
+ compat_ulong_t __unused2;
+ compat_time_t msg_ctime;
+ compat_ulong_t __unused3;
+ compat_ulong_t msg_cbytes;
+ compat_ulong_t msg_qnum;
+ compat_ulong_t msg_qbytes;
+ compat_pid_t msg_lspid;
+ compat_pid_t msg_lrpid;
+ compat_ulong_t __unused4;
+ compat_ulong_t __unused5;
+};
+
+struct compat_shmid64_ds {
+ struct compat_ipc64_perm shm_perm;
+ compat_size_t shm_segsz;
+ compat_time_t shm_atime;
+ compat_ulong_t __unused1;
+ compat_time_t shm_dtime;
+ compat_ulong_t __unused2;
+ compat_time_t shm_ctime;
+ compat_ulong_t __unused3;
+ compat_pid_t shm_cpid;
+ compat_pid_t shm_lpid;
+ compat_ulong_t shm_nattch;
+ compat_ulong_t __unused4;
+ compat_ulong_t __unused5;
+};
+
/*
* A pointer passed in from user mode. This should not
* be used for syscall parameters, just declare them
_