1 files changed, 53 insertions, 127 deletions

diff --git a/net/socket.c b/net/socket.c
index bbedbfcb42c2..884e32997698 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -140,8 +140,6 @@ static ssize_t sock_splice_read(struct file *file, loff_t *ppos,
 static const struct file_operations socket_file_ops = {
         .owner =        THIS_MODULE,
         .llseek =       no_llseek,
-        .read =         new_sync_read,
-        .write =        new_sync_write,
         .read_iter =    sock_read_iter,
         .write_iter =   sock_write_iter,
         .poll =         sock_poll,
@@ -314,7 +312,7 @@ static const struct super_operations sockfs_ops = {
 static char *sockfs_dname(struct dentry *dentry, char *buffer, int buflen)
 {
         return dynamic_dname(dentry, buffer, buflen, "socket:[%lu]",
-                                dentry->d_inode->i_ino);
+                                d_inode(dentry)->i_ino);
 }
 
 static const struct dentry_operations sockfs_dentry_operations = {
@@ -377,7 +375,7 @@ struct file *sock_alloc_file(struct socket *sock, int flags, const char *dname)
                   &socket_file_ops);
         if (unlikely(IS_ERR(file))) {
                 /* drop dentry, keep inode */
-                ihold(path.dentry->d_inode);
+                ihold(d_inode(path.dentry));
                 path_put(&path);
                 return file;
         }
@@ -499,7 +497,7 @@ static ssize_t sockfs_listxattr(struct dentry *dentry, char *buffer,
         ssize_t len;
         ssize_t used = 0;
 
-        len = security_inode_listsecurity(dentry->d_inode, buffer, size);
+        len = security_inode_listsecurity(d_inode(dentry), buffer, size);
         if (len < 0)
                 return len;
         used += len;
@@ -610,60 +608,27 @@ void __sock_tx_timestamp(const struct sock *sk, __u8 *tx_flags)
 }
 EXPORT_SYMBOL(__sock_tx_timestamp);
 
-static inline int __sock_sendmsg_nosec(struct kiocb *iocb, struct socket *sock,
-                                       struct msghdr *msg, size_t size)
+static inline int sock_sendmsg_nosec(struct socket *sock, struct msghdr *msg)
 {
-        return sock->ops->sendmsg(iocb, sock, msg, size);
-}
-
-static inline int __sock_sendmsg(struct kiocb *iocb, struct socket *sock,
-                                 struct msghdr *msg, size_t size)
-{
-        int err = security_socket_sendmsg(sock, msg, size);
-
-        return err ?: __sock_sendmsg_nosec(iocb, sock, msg, size);
-}
-
-static int do_sock_sendmsg(struct socket *sock, struct msghdr *msg,
-                           size_t size, bool nosec)
-{
-        struct kiocb iocb;
-        int ret;
-
-        init_sync_kiocb(&iocb, NULL);
-        ret = nosec ? __sock_sendmsg_nosec(&iocb, sock, msg, size) :
-                      __sock_sendmsg(&iocb, sock, msg, size);
-        if (-EIOCBQUEUED == ret)
-                ret = wait_on_sync_kiocb(&iocb);
+        int ret = sock->ops->sendmsg(sock, msg, msg_data_left(msg));
+        BUG_ON(ret == -EIOCBQUEUED);
         return ret;
 }
 
-int sock_sendmsg(struct socket *sock, struct msghdr *msg, size_t size)
+int sock_sendmsg(struct socket *sock, struct msghdr *msg)
 {
-        return do_sock_sendmsg(sock, msg, size, false);
-}
-EXPORT_SYMBOL(sock_sendmsg);
+        int err = security_socket_sendmsg(sock, msg,
+                                          msg_data_left(msg));
 
-static int sock_sendmsg_nosec(struct socket *sock, struct msghdr *msg, size_t size)
-{
-        return do_sock_sendmsg(sock, msg, size, true);
+        return err ?: sock_sendmsg_nosec(sock, msg);
 }
+EXPORT_SYMBOL(sock_sendmsg);
 
 int kernel_sendmsg(struct socket *sock, struct msghdr *msg,
                    struct kvec *vec, size_t num, size_t size)
 {
-        mm_segment_t oldfs = get_fs();
-        int result;
-
-        set_fs(KERNEL_DS);
-        /*
-         * the following is safe, since for compiler definitions of kvec and
-         * iovec are identical, yielding the same in-core layout and alignment
-         */
-        iov_iter_init(&msg->msg_iter, WRITE, (struct iovec *)vec, num, size);
-        result = sock_sendmsg(sock, msg, size);
-        set_fs(oldfs);
-        return result;
+        iov_iter_kvec(&msg->msg_iter, WRITE | ITER_KVEC, vec, num, size);
+        return sock_sendmsg(sock, msg);
 }
 EXPORT_SYMBOL(kernel_sendmsg);
 
@@ -731,9 +696,9 @@ EXPORT_SYMBOL_GPL(__sock_recv_wifi_status);
 static inline void sock_recv_drops(struct msghdr *msg, struct sock *sk,
                                    struct sk_buff *skb)
 {
-        if (sock_flag(sk, SOCK_RXQ_OVFL) && skb && skb->dropcount)
+        if (sock_flag(sk, SOCK_RXQ_OVFL) && skb && SOCK_SKB_CB(skb)->dropcount)
                 put_cmsg(msg, SOL_SOCKET, SO_RXQ_OVFL,
-                        sizeof(__u32), &skb->dropcount);
+                        sizeof(__u32), &SOCK_SKB_CB(skb)->dropcount);
 }
 
 void __sock_recv_ts_and_drops(struct msghdr *msg, struct sock *sk,
@@ -744,47 +709,21 @@ void __sock_recv_ts_and_drops(struct msghdr *msg, struct sock *sk,
 }
 EXPORT_SYMBOL_GPL(__sock_recv_ts_and_drops);
 
-static inline int __sock_recvmsg_nosec(struct kiocb *iocb, struct socket *sock,
-                                       struct msghdr *msg, size_t size, int flags)
+static inline int sock_recvmsg_nosec(struct socket *sock, struct msghdr *msg,
+                                     size_t size, int flags)
 {
-        return sock->ops->recvmsg(iocb, sock, msg, size, flags);
+        return sock->ops->recvmsg(sock, msg, size, flags);
 }
 
-static inline int __sock_recvmsg(struct kiocb *iocb, struct socket *sock,
-                                 struct msghdr *msg, size_t size, int flags)
+int sock_recvmsg(struct socket *sock, struct msghdr *msg, size_t size,
+                 int flags)
 {
         int err = security_socket_recvmsg(sock, msg, size, flags);
 
-        return err ?: __sock_recvmsg_nosec(iocb, sock, msg, size, flags);
-}
-
-int sock_recvmsg(struct socket *sock, struct msghdr *msg,
-                 size_t size, int flags)
-{
-        struct kiocb iocb;
-        int ret;
-
-        init_sync_kiocb(&iocb, NULL);
-        ret = __sock_recvmsg(&iocb, sock, msg, size, flags);
-        if (-EIOCBQUEUED == ret)
-                ret = wait_on_sync_kiocb(&iocb);
-        return ret;
+        return err ?: sock_recvmsg_nosec(sock, msg, size, flags);
 }
 EXPORT_SYMBOL(sock_recvmsg);
 
-static int sock_recvmsg_nosec(struct socket *sock, struct msghdr *msg,
-                              size_t size, int flags)
-{
-        struct kiocb iocb;
-        int ret;
-
-        init_sync_kiocb(&iocb, NULL);
-        ret = __sock_recvmsg_nosec(&iocb, sock, msg, size, flags);
-        if (-EIOCBQUEUED == ret)
-                ret = wait_on_sync_kiocb(&iocb);
-        return ret;
-}
-
 /**
  * kernel_recvmsg - Receive a message from a socket (kernel space)
  * @sock:       The socket to receive the message from
@@ -806,12 +745,8 @@ int kernel_recvmsg(struct socket *sock, struct msghdr *msg,
         mm_segment_t oldfs = get_fs();
         int result;
 
+        iov_iter_kvec(&msg->msg_iter, READ | ITER_KVEC, vec, num, size);
         set_fs(KERNEL_DS);
-        /*
-         * the following is safe, since for compiler definitions of kvec and
-         * iovec are identical, yielding the same in-core layout and alignment
-         */
-        iov_iter_init(&msg->msg_iter, READ, (struct iovec *)vec, num, size);
         result = sock_recvmsg(sock, msg, size, flags);
         set_fs(oldfs);
         return result;
@@ -849,7 +784,8 @@ static ssize_t sock_read_iter(struct kiocb *iocb, struct iov_iter *to)
 {
         struct file *file = iocb->ki_filp;
         struct socket *sock = file->private_data;
-        struct msghdr msg = {.msg_iter = *to};
+        struct msghdr msg = {.msg_iter = *to,
+                             .msg_iocb = iocb};
         ssize_t res;
 
         if (file->f_flags & O_NONBLOCK)
@@ -858,11 +794,10 @@ static ssize_t sock_read_iter(struct kiocb *iocb, struct iov_iter *to)
         if (iocb->ki_pos != 0)
                 return -ESPIPE;
 
-        if (iocb->ki_nbytes == 0)       /* Match SYS5 behaviour */
+        if (!iov_iter_count(to))        /* Match SYS5 behaviour */
                 return 0;
 
-        res = __sock_recvmsg(iocb, sock, &msg,
-                             iocb->ki_nbytes, msg.msg_flags);
+        res = sock_recvmsg(sock, &msg, iov_iter_count(to), msg.msg_flags);
         *to = msg.msg_iter;
         return res;
 }
@@ -871,7 +806,8 @@ static ssize_t sock_write_iter(struct kiocb *iocb, struct iov_iter *from)
 {
         struct file *file = iocb->ki_filp;
         struct socket *sock = file->private_data;
-        struct msghdr msg = {.msg_iter = *from};
+        struct msghdr msg = {.msg_iter = *from,
+                             .msg_iocb = iocb};
         ssize_t res;
 
         if (iocb->ki_pos != 0)
@@ -883,7 +819,7 @@ static ssize_t sock_write_iter(struct kiocb *iocb, struct iov_iter *from)
         if (sock->type == SOCK_SEQPACKET)
                 msg.msg_flags |= MSG_EOR;
 
-        res = __sock_sendmsg(iocb, sock, &msg, iocb->ki_nbytes);
+        res = sock_sendmsg(sock, &msg);
         *from = msg.msg_iter;
         return res;
 }
@@ -1700,16 +1636,14 @@ SYSCALL_DEFINE6(sendto, int, fd, void __user *, buff, size_t, len,
         struct iovec iov;
         int fput_needed;
 
-        if (len > INT_MAX)
-                len = INT_MAX;
+        err = import_single_range(WRITE, buff, len, &iov, &msg.msg_iter);
+        if (unlikely(err))
+                return err;
         sock = sockfd_lookup_light(fd, &err, &fput_needed);
         if (!sock)
                 goto out;
 
-        iov.iov_base = buff;
-        iov.iov_len = len;
         msg.msg_name = NULL;
-        iov_iter_init(&msg.msg_iter, WRITE, &iov, 1, len);
         msg.msg_control = NULL;
         msg.msg_controllen = 0;
         msg.msg_namelen = 0;
@@ -1723,7 +1657,7 @@ SYSCALL_DEFINE6(sendto, int, fd, void __user *, buff, size_t, len,
         if (sock->file->f_flags & O_NONBLOCK)
                 flags |= MSG_DONTWAIT;
         msg.msg_flags = flags;
-        err = sock_sendmsg(sock, &msg, len);
+        err = sock_sendmsg(sock, &msg);
 
 out_put:
         fput_light(sock->file, fput_needed);
@@ -1758,24 +1692,22 @@ SYSCALL_DEFINE6(recvfrom, int, fd, void __user *, ubuf, size_t, size,
         int err, err2;
         int fput_needed;
 
-        if (size > INT_MAX)
-                size = INT_MAX;
+        err = import_single_range(READ, ubuf, size, &iov, &msg.msg_iter);
+        if (unlikely(err))
+                return err;
         sock = sockfd_lookup_light(fd, &err, &fput_needed);
         if (!sock)
                 goto out;
 
         msg.msg_control = NULL;
         msg.msg_controllen = 0;
-        iov.iov_len = size;
-        iov.iov_base = ubuf;
-        iov_iter_init(&msg.msg_iter, READ, &iov, 1, size);
         /* Save some cycles and don't copy the address if not needed */
         msg.msg_name = addr ? (struct sockaddr *)&address : NULL;
         /* We assume all kernel code knows the size of sockaddr_storage */
         msg.msg_namelen = 0;
         if (sock->file->f_flags & O_NONBLOCK)
                 flags |= MSG_DONTWAIT;
-        err = sock_recvmsg(sock, &msg, size, flags);
+        err = sock_recvmsg(sock, &msg, iov_iter_count(&msg.msg_iter), flags);
 
         if (err >= 0 && addr != NULL) {
                 err2 = move_addr_to_user(&address,
@@ -1895,10 +1827,10 @@ struct used_address {
         unsigned int name_len;
 };
 
-static ssize_t copy_msghdr_from_user(struct msghdr *kmsg,
-                                     struct user_msghdr __user *umsg,
-                                     struct sockaddr __user **save_addr,
-                                     struct iovec **iov)
+static int copy_msghdr_from_user(struct msghdr *kmsg,
+                                 struct user_msghdr __user *umsg,
+                                 struct sockaddr __user **save_addr,
+                                 struct iovec **iov)
 {
         struct sockaddr __user *uaddr;
         struct iovec __user *uiov;
@@ -1942,13 +1874,10 @@ static ssize_t copy_msghdr_from_user(struct msghdr *kmsg,
         if (nr_segs > UIO_MAXIOV)
                 return -EMSGSIZE;
 
-        err = rw_copy_check_uvector(save_addr ? READ : WRITE,
-                                    uiov, nr_segs,
-                                    UIO_FASTIOV, *iov, iov);
-        if (err >= 0)
-                iov_iter_init(&kmsg->msg_iter, save_addr ? READ : WRITE,
-                              *iov, nr_segs, err);
-        return err;
+        kmsg->msg_iocb = NULL;
+
+        return import_iovec(save_addr ? READ : WRITE, uiov, nr_segs,
+                            UIO_FASTIOV, iov, &kmsg->msg_iter);
 }
 
 static int ___sys_sendmsg(struct socket *sock, struct user_msghdr __user *msg,
@@ -1963,7 +1892,7 @@ static int ___sys_sendmsg(struct socket *sock, struct user_msghdr __user *msg,
             __attribute__ ((aligned(sizeof(__kernel_size_t))));
         /* 20 is size of ipv6_pktinfo */
         unsigned char *ctl_buf = ctl;
-        int ctl_len, total_len;
+        int ctl_len;
         ssize_t err;
 
         msg_sys->msg_name = &address;
@@ -1973,8 +1902,7 @@ static int ___sys_sendmsg(struct socket *sock, struct user_msghdr __user *msg,
         else
                 err = copy_msghdr_from_user(msg_sys, msg, NULL, &iov);
         if (err < 0)
-                goto out_freeiov;
-        total_len = err;
+                return err;
 
         err = -ENOBUFS;
 
@@ -2021,10 +1949,10 @@ static int ___sys_sendmsg(struct socket *sock, struct user_msghdr __user *msg,
             used_address->name_len == msg_sys->msg_namelen &&
             !memcmp(&used_address->name, msg_sys->msg_name,
                     used_address->name_len)) {
-                err = sock_sendmsg_nosec(sock, msg_sys, total_len);
+                err = sock_sendmsg_nosec(sock, msg_sys);
                 goto out_freectl;
         }
-        err = sock_sendmsg(sock, msg_sys, total_len);
+        err = sock_sendmsg(sock, msg_sys);
         /*
          * If this is sendmmsg() and sending to current destination address was
          * successful, remember it.
@@ -2040,8 +1968,7 @@ out_freectl:
         if (ctl_buf != ctl)
                 sock_kfree_s(sock->sk, ctl_buf, ctl_len);
 out_freeiov:
-        if (iov != iovstack)
-                kfree(iov);
+        kfree(iov);
         return err;
 }
 
@@ -2166,8 +2093,8 @@ static int ___sys_recvmsg(struct socket *sock, struct user_msghdr __user *msg,
         else
                 err = copy_msghdr_from_user(msg_sys, msg, &uaddr, &iov);
         if (err < 0)
-                goto out_freeiov;
-        total_len = err;
+                return err;
+        total_len = iov_iter_count(&msg_sys->msg_iter);
 
         cmsg_ptr = (unsigned long)msg_sys->msg_control;
         msg_sys->msg_flags = flags & (MSG_CMSG_CLOEXEC|MSG_CMSG_COMPAT);
@@ -2205,8 +2132,7 @@ static int ___sys_recvmsg(struct socket *sock, struct user_msghdr __user *msg,
         err = len;
 
 out_freeiov:
-        if (iov != iovstack)
-                kfree(iov);
+        kfree(iov);
         return err;
 }