summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-06-06 18:09:05 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-06-06 18:09:05 -0700
commit1612e111e4e565422242727efb59499cce8738e4 (patch)
tree83c9db56186ab66fdb17c946944cba870665cfc5 /include
parente2b02e25c5e9c2b5c8da22d8ca7efadc1b4e5468 (diff)
parenta7526eb5d06b0084ef12d7b168d008fcf516caab (diff)
downloadlinux-3.10-1612e111e4e565422242727efb59499cce8738e4.tar.gz
linux-3.10-1612e111e4e565422242727efb59499cce8738e4.tar.bz2
linux-3.10-1612e111e4e565422242727efb59499cce8738e4.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Pull networking fix from David Miller: "This is a quick one commit pull request to cure the regression introduced by the MSG_CMSG_COMPAT change." (Background: commit 1be374a0518a completely broke 32-bit COMPAT handling by not only disallowing MSG_CMSG_COMPAT from user APIs, but clearing it in our own internal use too!) * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: net: Unbreak compat_sys_{send,recv}msg
Diffstat (limited to 'include')
-rw-r--r--include/linux/socket.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/socket.h b/include/linux/socket.h
index 33bf2dfab19..b10ce4b341e 100644
--- a/include/linux/socket.h
+++ b/include/linux/socket.h
@@ -320,6 +320,9 @@ extern int put_cmsg(struct msghdr*, int level, int type, int len, void *data);
struct timespec;
+/* The __sys_...msg variants allow MSG_CMSG_COMPAT */
+extern long __sys_recvmsg(int fd, struct msghdr __user *msg, unsigned flags);
+extern long __sys_sendmsg(int fd, struct msghdr __user *msg, unsigned flags);
extern int __sys_recvmmsg(int fd, struct mmsghdr __user *mmsg, unsigned int vlen,
unsigned int flags, struct timespec *timeout);
extern int __sys_sendmmsg(int fd, struct mmsghdr __user *mmsg,