summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorMatthieu Baerts (NGI0) <matttbe@kernel.org>2024-08-28 08:14:32 +0200
committerPaolo Abeni <pabeni@redhat.com>2024-08-29 10:39:50 +0200
commit58e1b66b4e4b8a602d3f2843e8eba00a969ecce2 (patch)
treee0b9b75586f6f66cd9ca40f0e4887ed811c4fa2e /net
parent76a2d8394cc183df872adf04bf636eaf42746449 (diff)
downloadlinux-58e1b66b4e4b8a602d3f2843e8eba00a969ecce2.tar.gz
linux-58e1b66b4e4b8a602d3f2843e8eba00a969ecce2.tar.bz2
linux-58e1b66b4e4b8a602d3f2843e8eba00a969ecce2.zip
mptcp: pm: do not remove already closed subflows
It is possible to have in the list already closed subflows, e.g. the initial subflow has been already closed, but still in the list. No need to try to close it again, and increments the related counters again. Fixes: 0ee4261a3681 ("mptcp: implement mptcp_pm_remove_subflow") Cc: stable@vger.kernel.org Reviewed-by: Mat Martineau <martineau@kernel.org> Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org> Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Diffstat (limited to 'net')
-rw-r--r--net/mptcp/pm_netlink.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c
index 5a84a55e37cc..3ff273e219f2 100644
--- a/net/mptcp/pm_netlink.c
+++ b/net/mptcp/pm_netlink.c
@@ -838,6 +838,8 @@ static void mptcp_pm_nl_rm_addr_or_subflow(struct mptcp_sock *msk,
int how = RCV_SHUTDOWN | SEND_SHUTDOWN;
u8 id = subflow_get_local_id(subflow);
+ if (inet_sk_state_load(ssk) == TCP_CLOSE)
+ continue;
if (rm_type == MPTCP_MIB_RMADDR && remote_id != rm_id)
continue;
if (rm_type == MPTCP_MIB_RMSUBFLOW && id != rm_id)