summaryrefslogtreecommitdiffstats
path: root/net/socket.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2005-09-16 16:51:01 -0700
committerDavid S. Miller <davem@davemloft.net>2005-09-16 16:51:01 -0700
commit37f7f421cce13435fdc0d870caf51141e5ebf079 (patch)
tree402e68f26b4bd54df721589f8f0b2a9c67a01678 /net/socket.c
parent065d9cac98a5406ecd5a1368f8fd38f55739dee9 (diff)
downloadop-kernel-dev-37f7f421cce13435fdc0d870caf51141e5ebf079.zip
op-kernel-dev-37f7f421cce13435fdc0d870caf51141e5ebf079.tar.gz
[NET]: Do not leak MSG_CMSG_COMPAT into userspace.
Noticed by Sridhar Samudrala. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/socket.c')
-rw-r--r--net/socket.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/socket.c b/net/socket.c
index c699e93..f926447 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)
OpenPOWER on IntegriCloud