put iov_iter into msghdr

Note that the code _using_ ->msg_iter at that point will be very
unhappy with anything other than unshifted iovec-backed iov_iter.
We still need to convert users to proper primitives.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

5 files changed, 12 insertions, 8 deletions

diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
index cdedcf144463..b50861b22b6b 100644
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -755,11 +755,13 @@ ip_generic_getfrag(void *from, char *to, int offset, int len, int odd, struct sk
         struct msghdr *msg = from;
 
         if (skb->ip_summed == CHECKSUM_PARTIAL) {
-                if (memcpy_fromiovecend(to, msg->msg_iov, offset, len) < 0)
+                /* XXX: stripping const */
+                if (memcpy_fromiovecend(to, (struct iovec *)msg->msg_iter.iov, offset, len) < 0)
                         return -EFAULT;
         } else {
                 __wsum csum = 0;
-                if (csum_partial_copy_fromiovecend(to, msg->msg_iov, offset, len, &csum) < 0)
+                /* XXX: stripping const */
+                if (csum_partial_copy_fromiovecend(to, (struct iovec *)msg->msg_iter.iov, offset, len, &csum) < 0)
                         return -EFAULT;
                 skb->csum = csum_block_add(skb->csum, csum, odd);
         }
diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
index 8dd4ae0424fc..c0d82f78d364 100644
--- a/net/ipv4/ping.c
+++ b/net/ipv4/ping.c
@@ -811,7 +811,8 @@ back_from_confirm:
         pfh.icmph.checksum = 0;
         pfh.icmph.un.echo.id = inet->inet_sport;
         pfh.icmph.un.echo.sequence = user_icmph.un.echo.sequence;
-        pfh.iov = msg->msg_iov;
+        /* XXX: stripping const */
+        pfh.iov = (struct iovec *)msg->msg_iter.iov;
         pfh.wcheck = 0;
         pfh.family = AF_INET;
 
diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
index 5d83bd2fcedb..0bb68df5055d 100644
--- a/net/ipv4/raw.c
+++ b/net/ipv4/raw.c
@@ -625,7 +625,8 @@ static int raw_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
 back_from_confirm:
 
         if (inet->hdrincl)
-                err = raw_send_hdrinc(sk, &fl4, msg->msg_iov, len,
+                /* XXX: stripping const */
+                err = raw_send_hdrinc(sk, &fl4, (struct iovec *)msg->msg_iter.iov, len,
                                       &rt, msg->msg_flags);
 
          else {
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 4a96f3730170..54ba6209eea9 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -1085,7 +1085,7 @@ static int tcp_sendmsg_fastopen(struct sock *sk, struct msghdr *msg,
 int tcp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
                 size_t size)
 {
-        struct iovec *iov;
+        const struct iovec *iov;
         struct tcp_sock *tp = tcp_sk(sk);
         struct sk_buff *skb;
         int iovlen, flags, err, copied = 0;
@@ -1136,8 +1136,8 @@ int tcp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
         mss_now = tcp_send_mss(sk, &size_goal, flags);
 
         /* Ok commence sending. */
-        iovlen = msg->msg_iovlen;
-        iov = msg->msg_iov;
+        iovlen = msg->msg_iter.nr_segs;
+        iov = msg->msg_iter.iov;
         copied = 0;
 
         err = -EPIPE;
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index f5bd4bd3f7e6..3e225b03eb95 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -3050,7 +3050,7 @@ static int tcp_send_syn_data(struct sock *sk, struct sk_buff *syn)
         syn_data->ip_summed = CHECKSUM_PARTIAL;
         memcpy(syn_data->cb, syn->cb, sizeof(syn->cb));
         if (unlikely(memcpy_fromiovecend(skb_put(syn_data, space),
-                                         fo->data->msg_iov, 0, space))) {
+                                         fo->data->msg_iter.iov, 0, space))) {
                 kfree_skb(syn_data);
                 goto fallback;
         }