diff options
| author | Matthieu Baerts <matthieu.baerts@tessares.net> | 2023-03-09 15:50:03 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-03-22 13:31:34 +0100 |
| commit | f4afee17de4320cc4eceef599af13365f62a14de (patch) | |
| tree | 5e19c0969029daa4bf7470426bf8d78d99372d67 | |
| parent | 64473c18d27a3decbec92aa87378072b2327775d (diff) | |
| download | linux-stable-f4afee17de4320cc4eceef599af13365f62a14de.tar.gz linux-stable-f4afee17de4320cc4eceef599af13365f62a14de.tar.bz2 linux-stable-f4afee17de4320cc4eceef599af13365f62a14de.zip | |
mptcp: avoid setting TCP_CLOSE state twice
commit 3ba14528684f528566fb7d956bfbfb958b591d86 upstream.
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>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | net/mptcp/subflow.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c index 712e4d98aae4..232f437770a6 100644 --- a/net/mptcp/subflow.c +++ b/net/mptcp/subflow.c @@ -358,7 +358,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) && |