1 files changed, 1 insertions, 3 deletions

diff --git a/net/socket.c b/net/socket.c
index f4530196a70a..b71114250046 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -1939,9 +1939,7 @@ asmlinkage long sys_recvmsg(int fd, struct msghdr __user *msg,
         total_len = err;
 
         cmsg_ptr = (unsigned long)msg_sys.msg_control;
-        msg_sys.msg_flags = 0;
-        if (MSG_CMSG_COMPAT & flags)
-                msg_sys.msg_flags = MSG_CMSG_COMPAT;
+        msg_sys.msg_flags = flags & (MSG_CMSG_CLOEXEC|MSG_CMSG_COMPAT);
 
         if (sock->file->f_flags & O_NONBLOCK)
                 flags |= MSG_DONTWAIT;