projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
NFS: Drop inode after rename
[linux-2.6-block.git]
/
net
/
socket.c
diff --git
a/net/socket.c
b/net/socket.c
index c699e93c33d72141332fdfa0c16afa87ed4a971e..f9264472377f563976060325a76cab8ec96da7ce 100644
(file)
--- 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)