Merge tag 'io_uring-5.5-20191212' of git://git.kernel.dk/linux-block

[linux-2.6-microblaze.git] / net / socket.c

diff --git a/net/socket.c b/net/socket.c
index ea28cbb..5062321 100644 (file)
--- a/net/socket.c
+++ b/net/socket.c
@@ -957,7 +957,7 @@ static ssize_t sock_read_iter(struct kiocb *iocb, struct iov_iter *to)
                             .msg_iocb = iocb};
        ssize_t res;
 
-       if (file->f_flags & O_NONBLOCK)
+       if (file->f_flags & O_NONBLOCK || (iocb->ki_flags & IOCB_NOWAIT))
                msg.msg_flags = MSG_DONTWAIT;
 
        if (iocb->ki_pos != 0)
@@ -982,7 +982,7 @@ static ssize_t sock_write_iter(struct kiocb *iocb, struct iov_iter *from)
        if (iocb->ki_pos != 0)
                return -ESPIPE;
 
-       if (file->f_flags & O_NONBLOCK)
+       if (file->f_flags & O_NONBLOCK || (iocb->ki_flags & IOCB_NOWAIT))
                msg.msg_flags = MSG_DONTWAIT;
 
        if (sock->type == SOCK_SEQPACKET)
@@ -1826,26 +1826,22 @@ SYSCALL_DEFINE3(accept, int, fd, struct sockaddr __user *, upeer_sockaddr,
  *     include the -EINPROGRESS status for such sockets.
  */
 
-int __sys_connect_file(struct file *file, struct sockaddr __user *uservaddr,
+int __sys_connect_file(struct file *file, struct sockaddr_storage *address,
                       int addrlen, int file_flags)
 {
        struct socket *sock;
-       struct sockaddr_storage address;
        int err;
 
        sock = sock_from_file(file, &err);
        if (!sock)
                goto out;
-       err = move_addr_to_kernel(uservaddr, addrlen, &address);
-       if (err < 0)
-               goto out;
 
        err =
-           security_socket_connect(sock, (struct sockaddr *)&address, addrlen);
+           security_socket_connect(sock, (struct sockaddr *)address, addrlen);
        if (err)
                goto out;
 
-       err = sock->ops->connect(sock, (struct sockaddr *)&address, addrlen,
+       err = sock->ops->connect(sock, (struct sockaddr *)address, addrlen,
                                 sock->file->f_flags | file_flags);
 out:
        return err;
@@ -1858,7 +1854,11 @@ int __sys_connect(int fd, struct sockaddr __user *uservaddr, int addrlen)
 
        f = fdget(fd);
        if (f.file) {
-               ret = __sys_connect_file(f.file, uservaddr, addrlen, 0);
+               struct sockaddr_storage address;
+
+               ret = move_addr_to_kernel(uservaddr, addrlen, &address);
+               if (!ret)
+                       ret = __sys_connect_file(f.file, &address, addrlen, 0);
                if (f.flags)
                        fput(f.file);
        }
@@ -2346,9 +2346,9 @@ out:
        return err;
 }
 
-static int sendmsg_copy_msghdr(struct msghdr *msg,
-                              struct user_msghdr __user *umsg, unsigned flags,
-                              struct iovec **iov)
+int sendmsg_copy_msghdr(struct msghdr *msg,
+                       struct user_msghdr __user *umsg, unsigned flags,
+                       struct iovec **iov)
 {
        int err;
 
@@ -2390,27 +2390,14 @@ static int ___sys_sendmsg(struct socket *sock, struct user_msghdr __user *msg,
 /*
  *     BSD sendmsg interface
  */
-long __sys_sendmsg_sock(struct socket *sock, struct user_msghdr __user *umsg,
+long __sys_sendmsg_sock(struct socket *sock, struct msghdr *msg,
                        unsigned int flags)
 {
-       struct iovec iovstack[UIO_FASTIOV], *iov = iovstack;
-       struct sockaddr_storage address;
-       struct msghdr msg = { .msg_name = &address };
-       ssize_t err;
-
-       err = sendmsg_copy_msghdr(&msg, umsg, flags, &iov);
-       if (err)
-               return err;
        /* disallow ancillary data requests from this path */
-       if (msg.msg_control || msg.msg_controllen) {
-               err = -EINVAL;
-               goto out;
-       }
+       if (msg->msg_control || msg->msg_controllen)
+               return -EINVAL;
 
-       err = ____sys_sendmsg(sock, &msg, flags, NULL, 0);
-out:
-       kfree(iov);
-       return err;
+       return ____sys_sendmsg(sock, msg, flags, NULL, 0);
 }
 
 long __sys_sendmsg(int fd, struct user_msghdr __user *msg, unsigned int flags,
@@ -2516,10 +2503,10 @@ SYSCALL_DEFINE4(sendmmsg, int, fd, struct mmsghdr __user *, mmsg,
        return __sys_sendmmsg(fd, mmsg, vlen, flags, true);
 }
 
-static int recvmsg_copy_msghdr(struct msghdr *msg,
-                              struct user_msghdr __user *umsg, unsigned flags,
-                              struct sockaddr __user **uaddr,
-                              struct iovec **iov)
+int recvmsg_copy_msghdr(struct msghdr *msg,
+                       struct user_msghdr __user *umsg, unsigned flags,
+                       struct sockaddr __user **uaddr,
+                       struct iovec **iov)
 {
        ssize_t err;
 
@@ -2559,7 +2546,12 @@ static int ____sys_recvmsg(struct socket *sock, struct msghdr *msg_sys,
 
        if (sock->file->f_flags & O_NONBLOCK)
                flags |= MSG_DONTWAIT;
-       err = (nosec ? sock_recvmsg_nosec : sock_recvmsg)(sock, msg_sys, flags);
+
+       if (unlikely(nosec))
+               err = sock_recvmsg_nosec(sock, msg_sys, flags);
+       else
+               err = sock_recvmsg(sock, msg_sys, flags);
+
        if (err < 0)
                goto out;
        len = err;
@@ -2609,28 +2601,15 @@ static int ___sys_recvmsg(struct socket *sock, struct user_msghdr __user *msg,
  *     BSD recvmsg interface
  */
 
-long __sys_recvmsg_sock(struct socket *sock, struct user_msghdr __user *umsg,
-                       unsigned int flags)
+long __sys_recvmsg_sock(struct socket *sock, struct msghdr *msg,
+                       struct user_msghdr __user *umsg,
+                       struct sockaddr __user *uaddr, unsigned int flags)
 {
-       struct iovec iovstack[UIO_FASTIOV], *iov = iovstack;
-       struct sockaddr_storage address;
-       struct msghdr msg = { .msg_name = &address };
-       struct sockaddr __user *uaddr;
-       ssize_t err;
-
-       err = recvmsg_copy_msghdr(&msg, umsg, flags, &uaddr, &iov);
-       if (err)
-               return err;
        /* disallow ancillary data requests from this path */
-       if (msg.msg_control || msg.msg_controllen) {
-               err = -EINVAL;
-               goto out;
-       }
+       if (msg->msg_control || msg->msg_controllen)
+               return -EINVAL;
 
-       err = ____sys_recvmsg(sock, &msg, umsg, uaddr, flags, 0);
-out:
-       kfree(iov);
-       return err;
+       return ____sys_recvmsg(sock, msg, umsg, uaddr, flags, 0);
 }
 
 long __sys_recvmsg(int fd, struct user_msghdr __user *msg, unsigned int flags,