From: Mat Martineau <mathew.j.martineau@linux.intel.com>
To: netdev@vger.kernel.org
Cc: Paolo Abeni <pabeni@redhat.com>,
davem@davemloft.net, kuba@kernel.org,
matthieu.baerts@tessares.net, mptcp@lists.linux.dev,
Mat Martineau <mathew.j.martineau@linux.intel.com>
Subject: [PATCH net-next 7/8] mptcp: backup flag from incoming MPJ ack option
Date: Fri, 13 Aug 2021 15:15:47 -0700 [thread overview]
Message-ID: <20210813221548.111990-8-mathew.j.martineau@linux.intel.com> (raw)
In-Reply-To: <20210813221548.111990-1-mathew.j.martineau@linux.intel.com>
From: Paolo Abeni <pabeni@redhat.com>
the parsed incoming backup flag is not propagated
to the subflow itself, the client may end-up using it
to send data.
Closes: https://github.com/multipath-tcp/mptcp_net-next/issues/191
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
---
net/mptcp/subflow.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c
index 966f777d35ce..1151926d335b 100644
--- a/net/mptcp/subflow.c
+++ b/net/mptcp/subflow.c
@@ -435,10 +435,12 @@ static void subflow_finish_connect(struct sock *sk, const struct sk_buff *skb)
goto do_reset;
}
+ subflow->backup = mp_opt.backup;
subflow->thmac = mp_opt.thmac;
subflow->remote_nonce = mp_opt.nonce;
- pr_debug("subflow=%p, thmac=%llu, remote_nonce=%u", subflow,
- subflow->thmac, subflow->remote_nonce);
+ pr_debug("subflow=%p, thmac=%llu, remote_nonce=%u backup=%d",
+ subflow, subflow->thmac, subflow->remote_nonce,
+ subflow->backup);
if (!subflow_thmac_valid(subflow)) {
MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_JOINACKMAC);
--
2.32.0
next prev parent reply other threads:[~2021-08-13 22:15 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-13 22:15 [PATCH net-next 0/8] mptcp: Improve use of backup subflows Mat Martineau
2021-08-13 22:15 ` [PATCH net-next 1/8] mptcp: more accurate timeout Mat Martineau
2021-08-13 22:15 ` [PATCH net-next 2/8] mptcp: less aggressive retransmission strategy Mat Martineau
2021-08-13 22:15 ` [PATCH net-next 3/8] mptcp: handle pending data on closed subflow Mat Martineau
2021-08-13 22:15 ` [PATCH net-next 4/8] mptcp: cleanup sysctl data and helpers Mat Martineau
2021-08-13 22:15 ` [PATCH net-next 5/8] mptcp: faster active backup recovery Mat Martineau
2021-08-13 22:15 ` [PATCH net-next 6/8] mptcp: add mibs for stale subflows processing Mat Martineau
2021-08-13 22:15 ` Mat Martineau [this message]
2021-08-13 22:15 ` [PATCH net-next 8/8] selftests: mptcp: add testcase for active-back Mat Martineau
2021-08-14 11:10 ` [PATCH net-next 0/8] mptcp: Improve use of backup subflows patchwork-bot+netdevbpf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210813221548.111990-8-mathew.j.martineau@linux.intel.com \
--to=mathew.j.martineau@linux.intel.com \
--cc=davem@davemloft.net \
--cc=kuba@kernel.org \
--cc=matthieu.baerts@tessares.net \
--cc=mptcp@lists.linux.dev \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox