From 26c4398bfb0b5996d60d58cad369739e4d65b064 Mon Sep 17 00:00:00 2001 From: Luis Henriques Date: Mon, 25 Jan 2016 10:30:21 +0000 Subject: [PATCH] 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 --- include/linux/skbuff.h | 2 +- net/core/datagram.c | 6 +----- net/ipv4/tcp_input.c | 2 +- net/ipv4/udp.c | 2 +- net/ipv6/raw.c | 2 +- net/ipv6/udp.c | 3 +-- 6 files changed, 6 insertions(+), 11 deletions(-) diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index e48943fa059e..2ba60e240410 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -2469,7 +2469,7 @@ extern int skb_copy_datagram_iovec(const struct sk_buff *from, int size); extern int skb_copy_and_csum_datagram_iovec(struct sk_buff *skb, int hlen, - struct iovec *iov, int len); + struct iovec *iov); extern int skb_copy_datagram_from_iovec(struct sk_buff *skb, int offset, const struct iovec *from, diff --git a/net/core/datagram.c b/net/core/datagram.c index ed5ffb6ae7d2..052b71c5b1b4 100644 --- a/net/core/datagram.c +++ b/net/core/datagram.c @@ -719,7 +719,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. * @@ -729,14 +728,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 13573244eb73..909762a150ed 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -4965,7 +4965,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 87c1b9ca08e0..8986f481c732 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c @@ -1255,7 +1255,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 c600a2049c68..ec0a11d9e531 100644 --- a/net/ipv6/raw.c +++ b/net/ipv6/raw.c @@ -484,7 +484,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 9e8273b2ff02..0a6233b50bc1 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c @@ -411,8 +411,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; }