diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2005-09-18 00:17:10 -0700 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2005-09-18 00:17:10 -0700 |
| commit | 21f130a2370ba837cdfc5204ebe52e7c664fec3d (patch) | |
| tree | 7f8a30088d8d39eab9350c59b6638661309ffe89 /net/socket.c | |
| parent | bc5e8fdfc622b03acf5ac974a1b8b26da6511c99 (diff) | |
| parent | c58ec93245a1fb7354f9e331960380827b9f41db (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/socket.c')
| -rw-r--r-- | net/socket.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/socket.c b/net/socket.c index c699e93c33d7..f9264472377f 100644 --- a/net/socket.c +++ b/net/socket.c @@ -1862,7 +1862,8 @@ asmlinkage long sys_recvmsg(int fd, struct msghdr __user *msg, unsigned int flag if (err < 0) goto out_freeiov; } - err = __put_user(msg_sys.msg_flags, COMPAT_FLAGS(msg)); + err = __put_user((msg_sys.msg_flags & ~MSG_CMSG_COMPAT), + COMPAT_FLAGS(msg)); if (err) goto out_freeiov; if (MSG_CMSG_COMPAT & flags) |