1 files changed, 31 insertions, 2 deletions

diff --git a/net/socket.c b/net/socket.c
index 6b94633ca61d..9ff6366fee13 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -2075,8 +2075,12 @@ SYSCALL_DEFINE3(sendmsg, int, fd, struct msghdr __user *, msg, unsigned int, fla
 {
         int fput_needed, err;
         struct msghdr msg_sys;
-        struct socket *sock = sockfd_lookup_light(fd, &err, &fput_needed);
+        struct socket *sock;
+
+        if (flags & MSG_CMSG_COMPAT)
+                return -EINVAL;
 
+        sock = sockfd_lookup_light(fd, &err, &fput_needed);
         if (!sock)
                 goto out;
 
@@ -2149,6 +2153,8 @@ int __sys_sendmmsg(int fd, struct mmsghdr __user *mmsg, unsigned int vlen,
 SYSCALL_DEFINE4(sendmmsg, int, fd, struct mmsghdr __user *, mmsg,
                 unsigned int, vlen, unsigned int, flags)
 {
+        if (flags & MSG_CMSG_COMPAT)
+                return -EINVAL;
         return __sys_sendmmsg(fd, mmsg, vlen, flags);
 }
 
@@ -2249,8 +2255,12 @@ SYSCALL_DEFINE3(recvmsg, int, fd, struct msghdr __user *, msg,
 {
         int fput_needed, err;
         struct msghdr msg_sys;
-        struct socket *sock = sockfd_lookup_light(fd, &err, &fput_needed);
+        struct socket *sock;
+
+        if (flags & MSG_CMSG_COMPAT)
+                return -EINVAL;
 
+        sock = sockfd_lookup_light(fd, &err, &fput_needed);
         if (!sock)
                 goto out;
 
@@ -2375,6 +2385,9 @@ SYSCALL_DEFINE5(recvmmsg, int, fd, struct mmsghdr __user *, mmsg,
         int datagrams;
         struct timespec timeout_sys;
 
+        if (flags & MSG_CMSG_COMPAT)
+                return -EINVAL;
+
         if (!timeout)
                 return __sys_recvmmsg(fd, mmsg, vlen, flags, NULL);
 
@@ -2492,15 +2505,31 @@ SYSCALL_DEFINE2(socketcall, int, call, unsigned long __user *, args)
                                    (int __user *)a[4]);
                 break;
         case SYS_SENDMSG:
+                if (a[2] & MSG_CMSG_COMPAT) {
+                        err = -EINVAL;
+                        break;
+                }
                 err = sys_sendmsg(a0, (struct msghdr __user *)a1, a[2]);
                 break;
         case SYS_SENDMMSG:
+                if (a[3] & MSG_CMSG_COMPAT) {
+                        err = -EINVAL;
+                        break;
+                }
                 err = sys_sendmmsg(a0, (struct mmsghdr __user *)a1, a[2], a[3]);
                 break;
         case SYS_RECVMSG:
+                if (a[2] & MSG_CMSG_COMPAT) {
+                        err = -EINVAL;
+                        break;
+                }
                 err = sys_recvmsg(a0, (struct msghdr __user *)a1, a[2]);
                 break;
         case SYS_RECVMMSG:
+                if (a[3] & MSG_CMSG_COMPAT) {
+                        err = -EINVAL;
+                        break;
+                }
                 err = sys_recvmmsg(a0, (struct mmsghdr __user *)a1, a[2], a[3],
                                    (struct timespec __user *)a[4]);
                 break;