Revert "[stable-only] net: add length argument to skb_copy_and_csum_datagram_iovec"

This reverts commit fa89ae5548ed282f0ceb4660b3b93e4e2ee875f3.

As reported by Michal Kubecek, the backport of commit 89c22d8c3b27
("net: Fix skb csum races when peeking") exposed an upstream bug.
It is being reverted and replaced by a better fix.

Signed-off-by: Luis Henriques <luis.henriques@canonical.com>

diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 94038f93f145ec1cc800b0671563dd1d7ecba258..010bc80be91c4b853c290805534680df657e6836 100644 (file)
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -2525,7 +2525,7 @@ unsigned int datagram_poll(struct file *file, struct socket *sock,
 int skb_copy_datagram_iovec(const struct sk_buff *from, int offset,
                            struct iovec *to, int size);
 int skb_copy_and_csum_datagram_iovec(struct sk_buff *skb, int hlen,
-                                    struct iovec *iov, int len);
+                                    struct iovec *iov);
 int skb_copy_datagram_from_iovec(struct sk_buff *skb, int offset,
                                 const struct iovec *from, int from_offset,
                                 int len);

diff --git a/net/core/datagram.c b/net/core/datagram.c
index 169f742d1464241f1180338483b87a083c288d26..3c69a464595eb6f6842169b3e222d0891746d1ef 100644 (file)
--- a/net/core/datagram.c
+++ b/net/core/datagram.c
@@ -818,7 +818,6 @@ EXPORT_SYMBOL(__skb_checksum_complete);
  *     @skb: skbuff
  *     @hlen: hardware length
  *     @iov: io vector
- *     @len: amount of data to copy from skb to iov
  *
  *     Caller _must_ check that skb will fit to this iovec.
  *
@@ -828,14 +827,11 @@ EXPORT_SYMBOL(__skb_checksum_complete);
  *                        can be modified!
  */
 int skb_copy_and_csum_datagram_iovec(struct sk_buff *skb,
-                                    int hlen, struct iovec *iov, int len)
+                                    int hlen, struct iovec *iov)
 {
        __wsum csum;
        int chunk = skb->len - hlen;
 
-       if (chunk > len)
-               chunk = len;
-
        if (!chunk)
                return 0;
 

diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index 43404d3f9da8190b0a77d223a495776b09c292d4..0366151255326a82f0e3c6477a5a08513d44ca5a 100644 (file)
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -4903,7 +4903,7 @@ static int tcp_copy_to_iovec(struct sock *sk, struct sk_buff *skb, int hlen)
                err = skb_copy_datagram_iovec(skb, hlen, tp->ucopy.iov, chunk);
        else
                err = skb_copy_and_csum_datagram_iovec(skb, hlen,
-                                                      tp->ucopy.iov, chunk);
+                                                      tp->ucopy.iov);
 
        if (!err) {
                tp->ucopy.len -= chunk;

diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index 4b9e4aba11b0a060cda7a7287baaf171d8ec138b..10c1530ba978e8d5efc5968f122489a0094d4f29 100644 (file)
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -1307,7 +1307,7 @@ try_again:
        else {
                err = skb_copy_and_csum_datagram_iovec(skb,
                                                       sizeof(struct udphdr),
-                                                      msg->msg_iov, copied);
+                                                      msg->msg_iov);
 
                if (err == -EINVAL)
                        goto csum_copy_err;

diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
index a652fdb6bd5d36293ad2bf23dba1c0f928b165e8..1463757e8682d9d16b019e8f4f95c272d1bf1083 100644 (file)
--- a/net/ipv6/raw.c
+++ b/net/ipv6/raw.c
@@ -492,7 +492,7 @@ static int rawv6_recvmsg(struct kiocb *iocb, struct sock *sk,
                        goto csum_copy_err;
                err = skb_copy_datagram_iovec(skb, 0, msg->msg_iov, copied);
        } else {
-               err = skb_copy_and_csum_datagram_iovec(skb, 0, msg->msg_iov, copied);
+               err = skb_copy_and_csum_datagram_iovec(skb, 0, msg->msg_iov);
                if (err == -EINVAL)
                        goto csum_copy_err;
        }

diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index eb38829d8919ca6c11ffead8bf36cbb1635725e9..f94b850511e344cacd85ccdb21462f75e1865896 100644 (file)
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -428,8 +428,7 @@ try_again:
                err = skb_copy_datagram_iovec(skb, sizeof(struct udphdr),
                                              msg->msg_iov, copied);
        else {
-               err = skb_copy_and_csum_datagram_iovec(skb, sizeof(struct udphdr),
-                                                      msg->msg_iov, copied);
+               err = skb_copy_and_csum_datagram_iovec(skb, sizeof(struct udphdr), msg->msg_iov);
                if (err == -EINVAL)
                        goto csum_copy_err;
        }