diff options
| author | Sabrina Dubroca <sd@queasysnail.net> | 2015-10-15 12:25:00 -0500 |
|---|---|---|
| committer | Moyster <oysterized@gmail.com> | 2016-11-17 12:12:22 +0100 |
| commit | d144ca5dd27898b4edbd407f7d4944f71a544252 (patch) | |
| tree | 527e6c0dde8047749e121057ea792ba755a063b6 /net/ipv6 | |
| parent | 6988083d00a11de2741d172fea664257f0e61d35 (diff) | |
net: add length argument to skb_copy_and_csum_datagram_iovec
Without this length argument, we can read past the end of the iovec in
memcpy_toiovec because we have no way of knowing the total length of the
iovec's buffers.
This is needed for stable kernels where 89c22d8c3b27 ("net: Fix skb
csum races when peeking") has been backported but that don't have the
ioviter conversion, which is almost all the stable trees <= 3.18.
This also fixes a kernel crash for NFS servers when the client uses
-onfsvers=3,proto=udp to mount the export.
Change-Id: I1865e3d7a1faee42a5008a9ad58c4d3323ea4bab
Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
Reviewed-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
(cherry picked from commit 1644c6f70701fea6b3f8bbe3130d5633a5ec14f0)
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/raw.c | 2 | ||||
| -rw-r--r-- | net/ipv6/udp.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c index a9db8d252..32c0d4e14 100644 --- a/net/ipv6/raw.c +++ b/net/ipv6/raw.c @@ -482,7 +482,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); + err = skb_copy_and_csum_datagram_iovec(skb, 0, msg->msg_iov, copied); if (err == -EINVAL) goto csum_copy_err; } diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c index e65230dee..625106578 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c @@ -411,7 +411,8 @@ 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); + err = skb_copy_and_csum_datagram_iovec(skb, sizeof(struct udphdr), + msg->msg_iov, copied); if (err == -EINVAL) goto csum_copy_err; } |