From: wujianguo106@163.com
To: mptcp@lists.linux.dev
Cc: pabeni@redhat.com, fw@strlen.de
Subject: [PATCH v5 4/4] mptcp: avoid processing packet if a subflow reset
Date: Wed, 16 Jun 2021 18:49:30 +0800 [thread overview]
Message-ID: <1623840570-42004-5-git-send-email-wujianguo106@163.com> (raw)
In-Reply-To: <1623840570-42004-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 | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/net/mptcp/options.c b/net/mptcp/options.c
index 1aec01686c1a..be435c5421cd 100644
--- a/net/mptcp/options.c
+++ b/net/mptcp/options.c
@@ -926,6 +926,12 @@ static bool check_fully_established(struct mptcp_sock *msk, struct sock *ssk,
return true;
reset:
+ /* If a subflow is reset, the packet should not continue to be
+ * processed in tcp_data_queue(), so setting: end_seq = seq,
+ * then tcp_data_queue() will drop the packet.
+ */
+ TCP_SKB_CB(skb)->end_seq = TCP_SKB_CB(skb)->seq;
+
mptcp_subflow_reset(ssk);
return false;
}
--
1.8.3.1
next prev parent reply other threads:[~2021-06-16 10:50 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-16 10:49 [PATCH v5 0/4] Fix some mptcp syncookie process bugs wujianguo106
2021-06-16 10:49 ` [PATCH v5 1/4] mptcp: fix warning in __skb_flow_dissect() when do syn cookie for subflow join wujianguo106
2021-06-18 22:40 ` Mat Martineau
2021-06-21 6:14 ` Jianguo Wu
2021-06-21 10:09 ` Jianguo Wu
2021-06-22 23:38 ` Mat Martineau
2021-06-16 10:49 ` [PATCH v5 2/4] mptcp: remove redundant req destruct in subflow_check_req() wujianguo106
2021-06-16 10:49 ` [PATCH v5 3/4] mptcp: fix syncookie process if mptcp can not_accept new subflow wujianguo106
2021-06-18 23:19 ` Mat Martineau
2021-06-21 6:24 ` Jianguo Wu
2021-06-24 2:08 ` Jianguo Wu
2021-06-24 22:36 ` Mat Martineau
2021-06-16 10:49 ` wujianguo106 [this message]
2021-06-19 0:19 ` [PATCH v5 4/4] mptcp: avoid processing packet if a subflow reset Mat Martineau
2021-06-21 6:35 ` Jianguo Wu
2021-06-23 0:00 ` Mat Martineau
2021-06-23 9:48 ` Paolo Abeni
2021-06-24 1:57 ` Jianguo Wu
2021-06-24 10:02 ` Paolo Abeni
2021-06-24 22:38 ` Mat Martineau
2021-06-25 0:51 ` Jianguo Wu
2021-06-19 0:26 ` [PATCH v5 0/4] Fix some mptcp syncookie process bugs Mat Martineau
2021-06-21 6:39 ` Jianguo Wu
2021-06-23 0:07 ` Mat Martineau
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=1623840570-42004-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.