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

mptcp: pm: reuse ID 0 after delete and re-add 



When the endpoint used by the initial subflow is removed and re-added
later, the PM has to force the ID 0, it is a special case imposed by the
MPTCP specs.

Note that the endpoint should then need to be re-added reusing the same
ID.

Fixes: 3ad14f54 ("mptcp: more accurate MPC endpoint tracking")
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 0870b0d8

net/mptcp/pm_netlink.c

+10 −0
Original line number Diff line number Diff line
@@ -585,6 +585,11 @@ static void mptcp_pm_create_subflow_or_signal_addr(struct mptcp_sock *msk) 


		__clear_bit(local.addr.id, msk->pm.id_avail_bitmap);

		msk->pm.add_addr_signaled++;



		/* Special case for ID0: set the correct ID */

		if (local.addr.id == msk->mpc_endpoint_id)

			local.addr.id = 0;



		mptcp_pm_announce_addr(msk, &local.addr, false);

		mptcp_pm_nl_addr_send_ack(msk);
@@ -609,6 +614,11 @@ static void mptcp_pm_create_subflow_or_signal_addr(struct mptcp_sock *msk) 


		msk->pm.local_addr_used++;

		__clear_bit(local.addr.id, msk->pm.id_avail_bitmap);



		/* Special case for ID0: set the correct ID */

		if (local.addr.id == msk->mpc_endpoint_id)

			local.addr.id = 0;



		nr = fill_remote_addresses_vec(msk, &local.addr, fullmesh, addrs);

		if (nr == 0)

			continue;