summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2018-02-22 14:38:14 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-03-08 22:41:12 -0800
commitf0a04a0e1ab48ba7089f9476dcf22ce00cf7b9e9 (patch)
treebf4af3c4a95752e83064fd41d17a36fbaf4fc3e7 /net
parent17634603d494978f5bf3ce9f261862c8f119af36 (diff)
downloadlinux-stable-f0a04a0e1ab48ba7089f9476dcf22ce00cf7b9e9.tar.gz
linux-stable-f0a04a0e1ab48ba7089f9476dcf22ce00cf7b9e9.tar.bz2
linux-stable-f0a04a0e1ab48ba7089f9476dcf22ce00cf7b9e9.zip
rxrpc: Fix send in rxrpc_send_data_packet()
[ Upstream commit 93c62c45ed5fad1b87e3a45835b251cd68de9c46 ] All the kernel_sendmsg() calls in rxrpc_send_data_packet() need to send both parts of the iov[] buffer, but one of them does not. Fix it so that it does. Without this, short IPv6 rxrpc DATA packets may be seen that have the rxrpc header included, but no payload. Fixes: 5a924b8951f8 ("rxrpc: Don't store the rxrpc header in the Tx queue sk_buffs") Reported-by: Marc Dionne <marc.dionne@auristor.com> Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
-rw-r--r--net/rxrpc/output.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/rxrpc/output.c b/net/rxrpc/output.c
index 71e6f713fbe7..5b67cb5d47f0 100644
--- a/net/rxrpc/output.c
+++ b/net/rxrpc/output.c
@@ -395,7 +395,7 @@ send_fragmentable:
(char *)&opt, sizeof(opt));
if (ret == 0) {
ret = kernel_sendmsg(conn->params.local->socket, &msg,
- iov, 1, iov[0].iov_len);
+ iov, 2, len);
opt = IPV6_PMTUDISC_DO;
kernel_setsockopt(conn->params.local->socket,