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/rxrpc/ar-recvmsg.c | |
| parent | 6988083d00a11de2741d172fea664257f0e61d35 (diff) | |
| download | android_kernel_m2note-d144ca5dd27898b4edbd407f7d4944f71a544252.tar.gz | |
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/rxrpc/ar-recvmsg.c')
| -rw-r--r-- | net/rxrpc/ar-recvmsg.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/rxrpc/ar-recvmsg.c b/net/rxrpc/ar-recvmsg.c index 5cc2da5d2..c67f5d3f6 100644 --- a/net/rxrpc/ar-recvmsg.c +++ b/net/rxrpc/ar-recvmsg.c @@ -185,7 +185,8 @@ int rxrpc_recvmsg(struct kiocb *iocb, struct socket *sock, msg->msg_iov, copy); } else { ret = skb_copy_and_csum_datagram_iovec(skb, offset, - msg->msg_iov); + msg->msg_iov, + copy); if (ret == -EINVAL) goto csum_copy_error; } |