OK, next attempt. I have left our the anal type checking for now.
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/diff -ruN 2.5.64-2003031211-32bit.1/fs/compat.c 2.5.64-2003031211-32bit.2/fs/compat.c --- 2.5.64-2003031211-32bit.1/fs/compat.c 2003-03-12 11:55:17.000000000 +1100 +++ 2.5.64-2003031211-32bit.2/fs/compat.c 2003-03-12 16:49:01.000000000 +1100 @@ -191,7 +191,7 @@ case F_GETLK: case F_SETLK: case F_SETLKW: - ret = get_compat_flock(&f, (struct compat_flock *)arg); + ret = get_compat_flock(&f, compat_ptr(arg)); if (ret != 0) break; old_fs = get_fs(); @@ -203,15 +203,14 @@ ((f.l_start + f.l_len) >= COMPAT_OFF_T_MAX)) ret = -EOVERFLOW; if (ret == 0) - ret = put_compat_flock(&f, - (struct compat_flock *)arg); + ret = put_compat_flock(&f, compat_ptr(arg)); } break; case F_GETLK64: case F_SETLK64: case F_SETLKW64: - ret = get_compat_flock64(&f, (struct compat_flock64 *)arg); + ret = get_compat_flock64(&f, compat_ptr(arg)); if (ret != 0) break; old_fs = get_fs(); @@ -226,8 +225,7 @@ ((f.l_start + f.l_len) >= COMPAT_LOFF_T_MAX)) ret = -EOVERFLOW; if (ret == 0) - ret = put_compat_flock64(&f, - (struct compat_flock64 *)arg); + ret = put_compat_flock64(&f, compat_ptr(arg)); } break; diff -ruN 2.5.64-2003031211-32bit.1/include/asm-ia64/compat.h 2.5.64-2003031211-32bit.2/include/asm-ia64/compat.h --- 2.5.64-2003031211-32bit.1/include/asm-ia64/compat.h 2003-03-09 20:34:45.000000000 +1100 +++ 2.5.64-2003031211-32bit.2/include/asm-ia64/compat.h 2003-03-12 16:41:42.000000000 +1100 @@ -107,4 +107,17 @@ #define COMPAT_OFF_T_MAX 0x7fffffff #define COMPAT_LOFF_T_MAX 0x7fffffffffffffffL +/* + * A pointer passed in from user mode. This should not + * be used for syscall parameters, just declare them + * as pointers because the syscall entry code will have + * appropriately comverted them already. + */ +typedef u32 compat_uptr_t; + +static inline void *compat_ptr(compat_ptr_t uptr) +{ + return (void *)uptr; +} + #endif /* _ASM_IA64_COMPAT_H */ diff -ruN 2.5.64-2003031211-32bit.1/include/asm-mips64/compat.h 2.5.64-2003031211-32bit.2/include/asm-mips64/compat.h --- 2.5.64-2003031211-32bit.1/include/asm-mips64/compat.h 2003-03-09 20:34:45.000000000 +1100 +++ 2.5.64-2003031211-32bit.2/include/asm-mips64/compat.h 2003-03-12 16:41:56.000000000 +1100 @@ -103,4 +103,17 @@ #define COMPAT_OFF_T_MAX 0x7fffffff #define COMPAT_LOFF_T_MAX 0x7fffffffffffffffL +/* + * A pointer passed in from user mode. This should not + * be used for syscall parameters, just declare them + * as pointers because the syscall entry code will have + * appropriately comverted them already. + */ +typedef u32 compat_uptr_t; + +static inline void *compat_ptr(compat_ptr_t uptr) +{ + return (void *)uptr; +} + #endif /* _ASM_MIPS64_COMPAT_H */ diff -ruN 2.5.64-2003031211-32bit.1/include/asm-parisc/compat.h 2.5.64-2003031211-32bit.2/include/asm-parisc/compat.h --- 2.5.64-2003031211-32bit.1/include/asm-parisc/compat.h 2003-03-12 11:55:19.000000000 +1100 +++ 2.5.64-2003031211-32bit.2/include/asm-parisc/compat.h 2003-03-12 16:42:07.000000000 +1100 @@ -103,4 +103,17 @@ #define COMPAT_OFF_T_MAX 0x7fffffff #define COMPAT_LOFF_T_MAX 0x7fffffffffffffffL +/* + * A pointer passed in from user mode. This should not + * be used for syscall parameters, just declare them + * as pointers because the syscall entry code will have + * appropriately comverted them already. + */ +typedef u32 compat_uptr_t; + +static inline void *compat_ptr(compat_ptr_t uptr) +{ + return (void *)uptr; +} + #endif /* _ASM_PARISC_COMPAT_H */ diff -ruN 2.5.64-2003031211-32bit.1/include/asm-ppc64/compat.h 2.5.64-2003031211-32bit.2/include/asm-ppc64/compat.h --- 2.5.64-2003031211-32bit.1/include/asm-ppc64/compat.h 2003-03-09 20:34:45.000000000 +1100 +++ 2.5.64-2003031211-32bit.2/include/asm-ppc64/compat.h 2003-03-12 16:43:27.000000000 +1100 @@ -98,4 +98,17 @@ #define COMPAT_OFF_T_MAX 0x7fffffff #define COMPAT_LOFF_T_MAX 0x7fffffffffffffffL +/* + * A pointer passed in from user mode. This should not + * be used for syscall parameters, just declare them + * as pointers because the syscall entry code will have + * appropriately comverted them already. + */ +typedef u32 compat_uptr_t; + +static inline void *compat_ptr(compat_ptr_t uptr) +{ + return (void *)uptr; +} + #endif /* _ASM_PPC64_COMPAT_H */ diff -ruN 2.5.64-2003031211-32bit.1/include/asm-s390x/compat.h 2.5.64-2003031211-32bit.2/include/asm-s390x/compat.h --- 2.5.64-2003031211-32bit.1/include/asm-s390x/compat.h 2003-03-12 11:55:20.000000000 +1100 +++ 2.5.64-2003031211-32bit.2/include/asm-s390x/compat.h 2003-03-12 16:42:53.000000000 +1100 @@ -101,4 +101,17 @@ #define COMPAT_OFF_T_MAX 0x7fffffff #define COMPAT_LOFF_T_MAX 0x7fffffffffffffffL +/* + * A pointer passed in from user mode. This should not + * be used for syscall parameters, just declare them + * as pointers because the syscall entry code will have + * appropriately comverted them already. + */ +typedef u32 compat_uptr_t; + +static inline void *compat_ptr(compat_ptr_t uptr) +{ + return (void *)(uptr & 0x7fffffffUL); +} + #endif /* _ASM_S390X_COMPAT_H */ diff -ruN 2.5.64-2003031211-32bit.1/include/asm-sparc64/compat.h 2.5.64-2003031211-32bit.2/include/asm-sparc64/compat.h --- 2.5.64-2003031211-32bit.1/include/asm-sparc64/compat.h 2003-03-09 20:34:45.000000000 +1100 +++ 2.5.64-2003031211-32bit.2/include/asm-sparc64/compat.h 2003-03-12 16:43:12.000000000 +1100 @@ -100,4 +100,17 @@ #define COMPAT_OFF_T_MAX 0x7fffffff #define COMPAT_LOFF_T_MAX 0x7fffffffffffffffL +/* + * A pointer passed in from user mode. This should not + * be used for syscall parameters, just declare them + * as pointers because the syscall entry code will have + * appropriately comverted them already. + */ +typedef u32 compat_uptr_t; + +static inline void *compat_ptr(compat_ptr_t uptr) +{ + return (void *)uptr; +} + #endif /* _ASM_SPARC64_COMPAT_H */ diff -ruN 2.5.64-2003031211-32bit.1/include/asm-x86_64/compat.h 2.5.64-2003031211-32bit.2/include/asm-x86_64/compat.h --- 2.5.64-2003031211-32bit.1/include/asm-x86_64/compat.h 2003-03-12 11:55:21.000000000 +1100 +++ 2.5.64-2003031211-32bit.2/include/asm-x86_64/compat.h 2003-03-12 16:43:56.000000000 +1100 @@ -107,4 +107,17 @@ #define COMPAT_OFF_T_MAX 0x7fffffff #define COMPAT_LOFF_T_MAX 0x7fffffffffffffff +/* + * A pointer passed in from user mode. This should not + * be used for syscall parameters, just declare them + * as pointers because the syscall entry code will have + * appropriately comverted them already. + */ +typedef u32 compat_uptr_t; + +static inline void *compat_ptr(compat_ptr_t uptr) +{ + return (void *)uptr; +} + #endif /* _ASM_X86_64_COMPAT_H */ diff -ruN 2.5.64-2003031211-32bit.1/net/compat.c 2.5.64-2003031211-32bit.2/net/compat.c --- 2.5.64-2003031211-32bit.1/net/compat.c 2003-03-12 11:55:24.000000000 +1100 +++ 2.5.64-2003031211-32bit.2/net/compat.c 2003-03-12 16:48:01.000000000 +1100 @@ -27,7 +27,6 @@ #include <asm/uaccess.h> #include <net/compat_socket.h> -#define A(__x) ((unsigned long)(__x)) #define AA(__x) ((unsigned long)(__x)) extern asmlinkage long sys_getsockopt(int fd, int level, int optname, @@ -49,7 +48,7 @@ break; } tot_len += len; - kiov->iov_base = (void *)A(buf); + kiov->iov_base = compat_ptr(buf); kiov->iov_len = (__kernel_size_t) len; uiov32++; kiov++; @@ -60,7 +59,7 @@ int msghdr_from_user_compat_to_kern(struct msghdr *kmsg, struct compat_msghdr *umsg) { - u32 tmp1, tmp2, tmp3; + compat_uptr_t tmp1, tmp2, tmp3; int err; err = get_user(tmp1, &umsg->msg_name); @@ -69,9 +68,9 @@ if (err) return -EFAULT; - kmsg->msg_name = (void *)A(tmp1); - kmsg->msg_iov = (struct iovec *)A(tmp2); - kmsg->msg_control = (void *)A(tmp3); + kmsg->msg_name = compat_ptr(tmp1); + kmsg->msg_iov = compat_ptr(tmp2); + kmsg->msg_control = compat_ptr(tmp3); err = get_user(kmsg->msg_namelen, &umsg->msg_namelen); err |= get_user(kmsg->msg_iovlen, &umsg->msg_iovlen); @@ -451,14 +450,14 @@ struct sock_filter *kfilter; unsigned int fsize; mm_segment_t old_fs; - __u32 uptr; + compat_uptr_t uptr; int ret; if (get_user(kfprog.len, &fprog32->len) || __get_user(uptr, &fprog32->filter)) return -EFAULT; - kfprog.filter = (struct sock_filter *)A(uptr); + kfprog.filter = compat_ptr(uptr); fsize = kfprog.len * sizeof(struct sock_filter); kfilter = (struct sock_filter *)kmalloc(fsize, GFP_KERNEL); @@ -639,36 +638,34 @@ ret = sys_socket(a0, a1, a[2]); break; case SYS_BIND: - ret = sys_bind(a0, (struct sockaddr *)A(a1), a[2]); + ret = sys_bind(a0, compat_ptr(a1), a[2]); break; case SYS_CONNECT: - ret = sys_connect(a0, (struct sockaddr *)A(a1), a[2]); + ret = sys_connect(a0, compat_ptr(a1), a[2]); break; case SYS_LISTEN: ret = sys_listen(a0, a1); break; case SYS_ACCEPT: - ret = sys_accept(a0, (struct sockaddr *)A(a1), (int *)A(a[2])); + ret = sys_accept(a0, compat_ptr(a1), compat_ptr(a[2])); break; case SYS_GETSOCKNAME: - ret = sys_getsockname(a0, (struct sockaddr *)A(a1), - (int *)A(a[2])); + ret = sys_getsockname(a0, compat_ptr(a1), compat_ptr(a[2])); break; case SYS_GETPEERNAME: - ret = sys_getpeername(a0, (struct sockaddr *)A(a1), - (int *)A(a[2])); + ret = sys_getpeername(a0, compat_ptr(a1), compat_ptr(a[2])); break; case SYS_SOCKETPAIR: - ret = sys_socketpair(a0, a1, a[2], (int *)A(a[3])); + ret = sys_socketpair(a0, a1, a[2], compat_ptr(a[3])); break; case SYS_SEND: - ret = sys_send(a0, (void *)A(a1), a[2], a[3]); + ret = sys_send(a0, compat_ptr(a1), a[2], a[3]); break; case SYS_SENDTO: ret = sys_sendto(a0, a1, a[2], a[3], a[4], a[5]); break; case SYS_RECV: - ret = sys_recv(a0, (void *)A(a1), a[2], a[3]); + ret = sys_recv(a0, compat_ptr(a1), a[2], a[3]); break; case SYS_RECVFROM: ret = sys_recvfrom(a0, a1, a[2], a[3], a[4], a[5]); @@ -677,20 +674,18 @@ ret = sys_shutdown(a0,a1); break; case SYS_SETSOCKOPT: - ret = compat_sys_setsockopt(a0, a1, a[2], (char *)A(a[3]), - a[4]); + ret = compat_sys_setsockopt(a0, a1, a[2], + compat_ptr(a[3]), a[4]); break; case SYS_GETSOCKOPT: - ret = compat_sys_getsockopt(a0, a1, a[2], (char *)(u64)a[3], - (int *)(u64)a[4]); + ret = compat_sys_getsockopt(a0, a1, a[2], + compat_ptr(a[3]), compat_ptr(a[4])); break; case SYS_SENDMSG: - ret = compat_sys_sendmsg(a0, (struct compat_msghdr *)A(a1), - a[2]); + ret = compat_sys_sendmsg(a0, compat_ptr(a1), a[2]); break; case SYS_RECVMSG: - ret = compat_sys_recvmsg(a0, (struct compat_msghdr *)A(a1), - a[2]); + ret = compat_sys_recvmsg(a0, compat_ptr(a1), a[2]); break; default: ret = -EINVAL; - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/