Commit 58e1b66b authored by Matthieu Baerts (NGI0)'s avatar Matthieu Baerts (NGI0) Committed by Paolo Abeni
Browse files

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: 0ee4261a ("mptcp: implement mptcp_pm_remove_subflow")
Cc: stable@vger.kernel.org
Reviewed-by: default avatarMat Martineau <martineau@kernel.org>
Signed-off-by: default avatarMatthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 76a2d839

net/mptcp/pm_netlink.c

+2 −0
Original line number Diff line number Diff line
@@ -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)