On Mon, 2009-06-22 at 00:03 +0200, Arnd Bergmann wrote:

On Sunday 21 June 2009, Johannes Berg wrote:

quoted

--- wireless-testing.orig/net/compat.c  2009-06-19 17:50:30.000000000 +0200
+++ wireless-testing/net/compat.c       2009-06-19 17:53:13.000000000 +0200

@@ -782,16 +782,18 @@ asmlinkage long compat_sys_socketcall(in
                ret = sys_socketpair(a0, a1, a[2], compat_ptr(a[3]));
                break;
        case SYS_SEND:
-               ret = sys_send(a0, compat_ptr(a1), a[2], a[3]);
+               ret = sys_send(a0, compat_ptr(a1), a[2], a[3] | MSG_CMSG_COMPAT);
                break;
        case SYS_SENDTO:
-               ret = sys_sendto(a0, compat_ptr(a1), a[2], a[3], compat_ptr(a[4]), a[5]);
+               ret = sys_sendto(a0, compat_ptr(a1), a[2], a[3] | MSG_CMSG_COMPAT,
+                                compat_ptr(a[4]), a[5]);
                break;
        case SYS_RECV:
-               ret = sys_recv(a0, compat_ptr(a1), a[2], a[3]);
+               ret = sys_recv(a0, compat_ptr(a1), a[2], a[3] | MSG_CMSG_COMPAT);
                break;
        case SYS_RECVFROM:
-               ret = sys_recvfrom(a0, compat_ptr(a1), a[2], a[3], compat_ptr(a[4]), compat_ptr(a[5]));
+               ret = sys_recvfrom(a0, compat_ptr(a1), a[2], a[3] | MSG_CMSG_COMPAT,
+                                  compat_ptr(a[4]), compat_ptr(a[5]));
                break;
        case SYS_SHUTDOWN:
                ret = sys_shutdown(a0,a1);

I suppose if you do this, you also need to introduce a
compat_sys_{send,sendto,recv,recvfrom} entry point
for architectures that do not go through sys_socket but
call sys_{send,sendto,recv,recvfrom} directly. I think
this is only sparc and mips.

Thanks, good catch, I'll take a look. Since I only care about recv(from)
I guess it would be better to only do those.

johannes