ip: stash a pointer to msghdr in struct ping_fakehdr

... instead of storing its ->mgs_iter.iov there

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

diff --git a/include/net/ping.h b/include/net/ping.h
index f074060bc5de763a3488054db67a67e7a0a9ab00..cc16d413f681c077f743547af38ab8d3293a0007 100644 (file)
--- a/include/net/ping.h
+++ b/include/net/ping.h
@@ -59,7 +59,7 @@ extern struct pingv6_ops pingv6_ops;
 
 struct pingfakehdr {
        struct icmphdr icmph;
-       struct iovec *iov;
+       struct msghdr *msg;
        sa_family_t family;
        __wsum wcheck;
 };

diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
index 2a3720fb5a5ff5401c5efbef49427fb18dbbfa5e..9e15ba701401afe8fea798ee84173e5c483f582e 100644 (file)
--- a/net/ipv4/ping.c
+++ b/net/ipv4/ping.c
@@ -602,14 +602,14 @@ int ping_getfrag(void *from, char *to,
                if (fraglen < sizeof(struct icmphdr))
                        BUG();
                if (csum_partial_copy_fromiovecend(to + sizeof(struct icmphdr),
-                           pfh->iov, 0, fraglen - sizeof(struct icmphdr),
+                           pfh->msg->msg_iter.iov, 0, fraglen - sizeof(struct icmphdr),
                            &pfh->wcheck))
                        return -EFAULT;
        } else if (offset < sizeof(struct icmphdr)) {
                        BUG();
        } else {
                if (csum_partial_copy_fromiovecend
-                               (to, pfh->iov, offset - sizeof(struct icmphdr),
+                               (to, pfh->msg->msg_iter.iov, offset - sizeof(struct icmphdr),
                                 fraglen, &pfh->wcheck))
                        return -EFAULT;
        }
@@ -811,8 +811,7 @@ 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;
-       /* XXX: stripping const */
-       pfh.iov = (struct iovec *)msg->msg_iter.iov;
+       pfh.msg = msg;
        pfh.wcheck = 0;
        pfh.family = AF_INET;
 

diff --git a/net/ipv6/ping.c b/net/ipv6/ping.c
index 2d3148378a1f6a7315b135090bf1fed57f181a3b..bd46f736f61d74bcb75a4dabef264154f55a9fb0 100644 (file)
--- a/net/ipv6/ping.c
+++ b/net/ipv6/ping.c
@@ -163,8 +163,7 @@ int ping_v6_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
        pfh.icmph.checksum = 0;
        pfh.icmph.un.echo.id = inet->inet_sport;
        pfh.icmph.un.echo.sequence = user_icmph.icmp6_sequence;
-       /* XXX: stripping const */
-       pfh.iov = (struct iovec *)msg->msg_iter.iov;
+       pfh.msg = msg;
        pfh.wcheck = 0;
        pfh.family = AF_INET6;