diff mbox series

[net-next,3/7] mptcp: generate subflow hmac after mptcp_finish_join()

Message ID 20210527235430.183465-4-mathew.j.martineau@linux.intel.com
State New, archived
Headers show
Series mptcp: Miscellaneous cleanup | expand

Commit Message

Mat Martineau May 27, 2021, 11:54 p.m. UTC
From: Jianguo Wu <wujianguo@chinatelecom.cn>

For outgoing subflow join, when recv SYNACK, in subflow_finish_connect(),
the mptcp_finish_join() may return false in some cases, and send a RESET
to remote, and no local hmac is required.
So generate subflow hmac after mptcp_finish_join().

Fixes: ec3edaa7ca6c ("mptcp: Add handling of outgoing MP_JOIN requests")
Signed-off-by: Jianguo Wu <wujianguo@chinatelecom.cn>
Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
 net/mptcp/subflow.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
diff mbox series


diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c
index a50a97908866..2a58503e55bd 100644
--- a/net/mptcp/subflow.c
+++ b/net/mptcp/subflow.c
@@ -430,15 +430,15 @@  static void subflow_finish_connect(struct sock *sk, const struct sk_buff *skb)
 			goto do_reset;
+		if (!mptcp_finish_join(sk))
+			goto do_reset;
 		subflow_generate_hmac(subflow->local_key, subflow->remote_key,
 		memcpy(subflow->hmac, hmac, MPTCPOPT_HMAC_LEN);
-		if (!mptcp_finish_join(sk))
-			goto do_reset;
 		subflow->mp_join = 1;