Handle subflow join failures
Subsystems (2)
Florian Westphal
PATCH 1/1 Handle subflow join failures
squashto: mptcp: Add handling of outgoing MP_JOIN requests
When the join request fails we should send a reset and also close the socket, we can't do anything useful with such a connection.
--- net/mptcp/subflow.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-)
net/mptcp/subflow.c +15 -7
@@ -187,10 +187,13 @@ static void subflow_finish_connect(struct sock *sk, const struct sk_buff *skb) subflow->icsk_af_ops->sk_rx_dst_set (sk, skb); -if (!subflow->conn) +if (subflow->conn_finished || !tcp_sk (sk)->is_mptcp)return ; -if (subflow->mp_capable && !subflow->conn_finished) { +if (!subflow->conn) + goto do_reset; + +if (subflow->mp_capable) {pr_debug ("subflow=%p, remote_key=%llu" ,mptcp_subflow_ctx (sk), subflow->remote_key);mptcp_finish_connect (sk);
@@ -200,14 +203,13 @@ static void subflow_finish_connect(struct sock *sk, const struct sk_buff *skb)pr_debug ("synack seq=%u" ,TCP_SKB_CB (skb)->seq); subflow->ssn_offset =TCP_SKB_CB (skb)->seq; } - }else if (subflow->mp_join && !subflow->conn_finished) { + }else if (subflow->mp_join) {pr_debug ("subflow=%p, thmac=%llu, remote_nonce=%u" , subflow, subflow->thmac, subflow->remote_nonce);if (!subflow_thmac_valid (subflow)) { subflow->mp_join =0 ; -// @@ need to trigger RST -return ; + goto do_reset; } mptcp_crypto_hmac_sha(subflow->local_key, subflow->remote_key,
@@ -218,8 +220,14 @@ static void subflow_finish_connect(struct sock *sk, const struct sk_buff *skb)if (skb) subflow->ssn_offset =TCP_SKB_CB (skb)->seq; -if (mptcp_finish_join (sk)) - subflow->conn_finished =1 ; +if (!mptcp_finish_join (sk)) + goto do_reset; + + subflow->conn_finished =1 ; + }else { +do_reset: +tcp_send_active_reset (sk,GFP_ATOMIC ); +tcp_done (sk); } }
Signature · 1 line
2.24.1
Paolo Abeni
Quoted 57 lines · Florian Westphal
squashto: mptcp: Add handling of outgoing
MP_JOINrequestsWhen the join request fails we should send a reset and also close the socket, we can't do anything useful with such a connection.
Signed-off-by Florian Westphal <fw(a)strlen.de>--- net/mptcp/subflow.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-)net/mptcp/subflow.c +7
-7@@ -187,10 +187,13 @@ static void subflow_finish_connect(struct sock *sk, const struct sk_buff *skb) subflow->icsk_af_ops->sk_rx_dst_set (sk, skb); -if (!subflow->conn) +if (subflow->conn_finished || !tcp_sk (sk)->is_mptcp)return ; -if (subflow->mp_capable && !subflow->conn_finished) { +if (!subflow->conn) + goto do_reset; + +if (subflow->mp_capable) {pr_debug ("subflow=%p, remote_key=%llu" ,mptcp_subflow_ctx (sk), subflow->remote_key);mptcp_finish_connect (sk);@@ -200,14 +203,13 @@ static void subflow_finish_connect(struct sock *sk, const struct sk_buff *skb)pr_debug ("synack seq=%u" ,TCP_SKB_CB (skb)->seq); subflow->ssn_offset =TCP_SKB_CB (skb)->seq; } - }else if (subflow->mp_join && !subflow->conn_finished) { + }else if (subflow->mp_join) {pr_debug ("subflow=%p, thmac=%llu, remote_nonce=%u" , subflow, subflow->thmac, subflow->remote_nonce);if (!subflow_thmac_valid (subflow)) { subflow->mp_join =0 ; -// @@ need to trigger RST -return ; + goto do_reset; } mptcp_crypto_hmac_sha(subflow->local_key, subflow->remote_key,@@ -218,8 +220,14 @@ static void subflow_finish_connect(struct sock *sk, const struct sk_buff *skb)if (skb) subflow->ssn_offset =TCP_SKB_CB (skb)->seq; -if (mptcp_finish_join (sk)) - subflow->conn_finished =1 ;
net/mptcp/subflow.c static void subflow_finish_connect(struct sock *sk, const struct sk_buff *skb) · line 232
Quoted 10 lines
net/mptcp/subflow.c +8
-0+if (!mptcp_finish_join (sk)) + goto do_reset; + + subflow->conn_finished =1 ; + }else { +do_reset: +tcp_send_active_reset (sk,GFP_ATOMIC ); +tcp_done (sk); } }
LGTM! It's nice to remove that old todo ;)
Thank you!
Paolo
Matthieu Baerts
Hi Florian, Paolo,
Quoted 6 lines · Paolo Abeni
Quoted 5 lines · Florian Westphal
squashto: mptcp: Add handling of outgoing
MP_JOINrequestsWhen the join request fails we should send a reset and also close the socket, we can't do anything useful with such a connection.
[...]
Quoted 1 line
LGTM! It's nice to remove that old todo ;)
Thank you for the patch and the review!
- cc94bbe4718f: "squashed" in "mptcp: Add handling of outgoing MP_JOIN requests"
- 704e4fa8a50c..4fe8bda1127e: result
Tests + export will be launched soon!
Cheers,
Matt
Signature · 5 lines
Matthieu Baerts | R&D Engineer matthieu.baerts(a)tessares.net Tessares SA | Hybrid Access Solutions www.tessares.net 1 Avenue Jean Monnet, 1348 Louvain-la-Neuve, Belgium
Peter Krystad
Quoted 55 lines · Paolo Abeni
Quoted 54 lines · Florian Westphal
squashto: mptcp: Add handling of outgoing
MP_JOINrequestsWhen the join request fails we should send a reset and also close the socket, we can't do anything useful with such a connection.
Signed-off-by Florian Westphal <fw(a)strlen.de>--- net/mptcp/subflow.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-)net/mptcp/subflow.c +7
-5@@ -187,10 +187,13 @@ static void subflow_finish_connect(struct sock *sk, const struct sk_buff *skb) subflow->icsk_af_ops->sk_rx_dst_set (sk, skb); -if (!subflow->conn) +if (subflow->conn_finished || !tcp_sk (sk)->is_mptcp)return ; -if (subflow->mp_capable && !subflow->conn_finished) { +if (!subflow->conn) + goto do_reset; + +if (subflow->mp_capable) {pr_debug ("subflow=%p, remote_key=%llu" ,mptcp_subflow_ctx (sk), subflow->remote_key);mptcp_finish_connect (sk);@@ -200,14 +203,13 @@ static void subflow_finish_connect(struct sock *sk, const struct sk_buff *skb)pr_debug ("synack seq=%u" ,TCP_SKB_CB (skb)->seq); subflow->ssn_offset =TCP_SKB_CB (skb)->seq; } - }else if (subflow->mp_join && !subflow->conn_finished) { + }else if (subflow->mp_join) {pr_debug ("subflow=%p, thmac=%llu, remote_nonce=%u" , subflow, subflow->thmac, subflow->remote_nonce);if (!subflow_thmac_valid (subflow)) { subflow->mp_join =0 ; -// @@ need to trigger RST -return ; + goto do_reset; } mptcp_crypto_hmac_sha(subflow->local_key, subflow->remote_key,@@ -218,8 +220,14 @@ static void subflow_finish_connect(struct sock *sk, const struct sk_buff *skb)if (skb) subflow->ssn_offset =TCP_SKB_CB (skb)->seq;
Quoted 14 lines
net/mptcp/subflow.c static void subflow_finish_connect(struct sock *sk, const struct sk_buff *skb) · line 232
Quoted 12 lines
net/mptcp/subflow.c +8
-2-if (mptcp_finish_join (sk)) - subflow->conn_finished =1 ; +if (!mptcp_finish_join (sk)) + goto do_reset; + + subflow->conn_finished =1 ; + }else { +do_reset: +tcp_send_active_reset (sk,GFP_ATOMIC ); +tcp_done (sk); } }LGTM! It's nice to remove that old todo ;)
Ditto this, I put that there a long time ago. Thank-you!
Peter.
Quoted 6 lines
Thank you!
Paolo
_______________________________________________
mptcp mailing list -- mptcp(a)lists.01.org
To unsubscribe send an email to mptcp-leave(a)lists.01.org