summaryrefslogtreecommitdiffstats
path: root/net/rxrpc
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2018-02-22 14:38:14 +0000
committerDavid S. Miller <davem@davemloft.net>2018-02-22 15:37:47 -0500
commit93c62c45ed5fad1b87e3a45835b251cd68de9c46 (patch)
tree75580d54c9267b37792257d37c7e0a1014dd6740 /net/rxrpc
parent370c10522e96bf1b2e7fd9e906dbe8fb5be895d2 (diff)
downloadlinux-stable-93c62c45ed5fad1b87e3a45835b251cd68de9c46.tar.gz
linux-stable-93c62c45ed5fad1b87e3a45835b251cd68de9c46.tar.bz2
linux-stable-93c62c45ed5fad1b87e3a45835b251cd68de9c46.zip
rxrpc: Fix send in rxrpc_send_data_packet()
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>
Diffstat (limited to 'net/rxrpc')
-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 42410e910aff..cf73dc006c3b 100644
--- a/net/rxrpc/output.c
+++ b/net/rxrpc/output.c
@@ -445,7 +445,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,