1 files changed, 17 insertions, 1 deletions

diff --git a/net/socket.c b/net/socket.c
index 16449d6daeca..293d56836f01 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -2222,9 +2222,10 @@ static int copy_msghdr_from_user(struct msghdr *kmsg,
 
         kmsg->msg_iocb = NULL;
 
-        return import_iovec(save_addr ? READ : WRITE,
+        err = import_iovec(save_addr ? READ : WRITE,
                             msg.msg_iov, msg.msg_iovlen,
                             UIO_FASTIOV, iov, &kmsg->msg_iter);
+        return err < 0 ? err : 0;
 }
 
 static int ___sys_sendmsg(struct socket *sock, struct user_msghdr __user *msg,
@@ -2326,6 +2327,13 @@ out_freeiov:
 /*
  *      BSD sendmsg interface
  */
+long __sys_sendmsg_sock(struct socket *sock, struct user_msghdr __user *msg,
+                        unsigned int flags)
+{
+        struct msghdr msg_sys;
+
+        return ___sys_sendmsg(sock, msg, &msg_sys, flags, NULL, 0);
+}
 
 long __sys_sendmsg(int fd, struct user_msghdr __user *msg, unsigned int flags,
                    bool forbid_cmsg_compat)
@@ -2500,6 +2508,14 @@ out_freeiov:
  *      BSD recvmsg interface
  */
 
+long __sys_recvmsg_sock(struct socket *sock, struct user_msghdr __user *msg,
+                        unsigned int flags)
+{
+        struct msghdr msg_sys;
+
+        return ___sys_recvmsg(sock, msg, &msg_sys, flags, 0);
+}
+
 long __sys_recvmsg(int fd, struct user_msghdr __user *msg, unsigned int flags,
                    bool forbid_cmsg_compat)
 {