X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=net%2Fsocket.c;h=c699e93c33d72141332fdfa0c16afa87ed4a971e;hb=c85b2a5fe200d744a814d23c258460d4fc98a546;hp=e1bd5d84d7bf11acce8a2c6b73d0f5ac41809d05;hpb=0dd7f883a9e21c5f2ff5e8f1cbb0e78cdc044d8a;p=linux-2.6-omap-h63xx.git

diff --git a/net/socket.c b/net/socket.c
index e1bd5d84d7b..c699e93c33d 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -1745,10 +1745,11 @@ asmlinkage long sys_sendmsg(int fd, struct msghdr __user *msg, unsigned flags)
 		goto out_freeiov;
 	ctl_len = msg_sys.msg_controllen; 
 	if ((MSG_CMSG_COMPAT & flags) && ctl_len) {
-		err = cmsghdr_from_user_compat_to_kern(&msg_sys, ctl, sizeof(ctl));
+		err = cmsghdr_from_user_compat_to_kern(&msg_sys, sock->sk, ctl, sizeof(ctl));
 		if (err)
 			goto out_freeiov;
 		ctl_buf = msg_sys.msg_control;
+		ctl_len = msg_sys.msg_controllen;
 	} else if (ctl_len) {
 		if (ctl_len > sizeof(ctl))
 		{