mptcp.lists.linux.dev archive mirror
 help / color / mirror / Atom feed
From: wujianguo106@163.com
To: mptcp@lists.linux.dev
Cc: pabeni@redhat.com, fw@strlen.de
Subject: [PATCH v4 4/4] mptcp: avoid processing packet if a subflow reset
Date: Tue, 15 Jun 2021 11:02:26 +0800	[thread overview]
Message-ID: <1623726146-5911-5-git-send-email-wujianguo106@163.com> (raw)
In-Reply-To: <1623726146-5911-1-git-send-email-wujianguo106@163.com>

From: Jianguo Wu <wujianguo@chinatelecom.cn>

If check_fully_established() causes a subflow reset, it should not
continue to process the packet in tcp_data_queue().

setting:
	TCP_SKB_CB(skb)->end_seq = TCP_SKB_CB(skb)->seq;

so that the following check will drop the pkt in
tcp_data_queue():
  if (TCP_SKB_CB(skb)->seq == TCP_SKB_CB(skb)->end_seq) {
	__kfree_skb(skb);
	return;
  }

Fixes: d582484726c4 ("mptcp: fix fallback for MP_JOIN subflows")
Signed-off-by: Jianguo Wu <wujianguo@chinatelecom.cn>
---
 net/mptcp/options.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/net/mptcp/options.c b/net/mptcp/options.c
index 1aec01686c1a..01a1bf60b187 100644
--- a/net/mptcp/options.c
+++ b/net/mptcp/options.c
@@ -926,6 +926,8 @@ static bool check_fully_established(struct mptcp_sock *msk, struct sock *ssk,
 	return true;
 
 reset:
+	TCP_SKB_CB(skb)->end_seq = TCP_SKB_CB(skb)->seq;
+
 	mptcp_subflow_reset(ssk);
 	return false;
 }
-- 
1.8.3.1


  parent reply	other threads:[~2021-06-15  3:18 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-15  3:02 [PATCH v4 0/4] Fix some mptcp syncookie process bugs wujianguo106
2021-06-15  3:02 ` [PATCH v4 1/4] mptcp: fix warning in __skb_flow_dissect() when do syn cookie for subflow join wujianguo106
2021-06-15  3:02 ` [PATCH v4 2/4] mptcp: remove redundant req destruct in subflow_check_req() wujianguo106
2021-06-15  3:02 ` [PATCH v4 3/4] mptcp: fix syncookie process if mptcp can not_accept new subflow wujianguo106
2021-06-15  3:02 ` wujianguo106 [this message]
2021-06-15 15:19   ` [PATCH v4 4/4] mptcp: avoid processing packet if a subflow reset Florian Westphal
2021-06-16  7:02     ` Jianguo Wu

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=1623726146-5911-5-git-send-email-wujianguo106@163.com \
    --to=wujianguo106@163.com \
    --cc=fw@strlen.de \
    --cc=mptcp@lists.linux.dev \
    --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;
as well as URLs for NNTP newsgroup(s).