From: Matthieu Baerts <matthieu.baerts@tessares.net>
To: mptcp@lists.linux.dev, "David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
Menglong Dong <imagedong@tencent.com>,
Mengen Sun <mengensun@tencent.com>, Shuah Khan <shuah@kernel.org>,
Florian Westphal <fw@strlen.de>,
Jiang Biao <benbjiang@tencent.com>
Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-kselftest@vger.kernel.org,
Matthieu Baerts <matthieu.baerts@tessares.net>,
stable@vger.kernel.org
Subject: [PATCH net 7/7] mptcp: avoid setting TCP_CLOSE state twice
Date: Mon, 27 Feb 2023 18:29:30 +0100 [thread overview]
Message-ID: <20230227-upstream-net-20230227-mptcp-fixes-v1-7-070e30ae4a8e@tessares.net> (raw)
In-Reply-To: <20230227-upstream-net-20230227-mptcp-fixes-v1-0-070e30ae4a8e@tessares.net>
tcp_set_state() is called from tcp_done() already.
There is then no need to first set the state to TCP_CLOSE, then call
tcp_done().
Fixes: d582484726c4 ("mptcp: fix fallback for MP_JOIN subflows")
Cc: stable@vger.kernel.org
Closes: https://github.com/multipath-tcp/mptcp_net-next/issues/362
Acked-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net>
---
net/mptcp/subflow.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c
index f6b4511b09b0..b865ba911bc4 100644
--- a/net/mptcp/subflow.c
+++ b/net/mptcp/subflow.c
@@ -406,7 +406,6 @@ void mptcp_subflow_reset(struct sock *ssk)
/* must hold: tcp_done() could drop last reference on parent */
sock_hold(sk);
- tcp_set_state(ssk, TCP_CLOSE);
tcp_send_active_reset(ssk, GFP_ATOMIC);
tcp_done(ssk);
if (!test_and_set_bit(MPTCP_WORK_CLOSE_SUBFLOW, &mptcp_sk(sk)->flags) &&
--
2.38.1
next prev parent reply other threads:[~2023-02-27 17:30 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-27 17:29 [PATCH net 0/7] mptcp: fixes for 6.3 Matthieu Baerts
2023-02-27 17:29 ` [PATCH net 1/7] mptcp: fix possible deadlock in subflow_error_report Matthieu Baerts
2023-02-27 17:29 ` [PATCH net 2/7] mptcp: refactor passive socket initialization Matthieu Baerts
2023-02-27 17:29 ` [PATCH net 3/7] mptcp: use the workqueue to destroy unaccepted sockets Matthieu Baerts
2023-02-27 17:29 ` [PATCH net 4/7] mptcp: fix UaF in listener shutdown Matthieu Baerts
2023-02-27 17:29 ` [PATCH net 5/7] selftests: mptcp: userspace pm: fix printed values Matthieu Baerts
2023-02-27 17:29 ` [PATCH net 6/7] mptcp: add ro_after_init for tcp{,v6}_prot_override Matthieu Baerts
2023-02-27 17:29 ` Matthieu Baerts [this message]
2023-02-28 11:28 ` [PATCH net 0/7] mptcp: fixes for 6.3 Matthieu Baerts
2023-02-28 11:33 ` Paolo Abeni
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=20230227-upstream-net-20230227-mptcp-fixes-v1-7-070e30ae4a8e@tessares.net \
--to=matthieu.baerts@tessares.net \
--cc=benbjiang@tencent.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=fw@strlen.de \
--cc=imagedong@tencent.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=mengensun@tencent.com \
--cc=mptcp@lists.linux.dev \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=shuah@kernel.org \
--cc=stable@vger.kernel.org \
/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).