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

mptcp: pm: ADD_ADDR 0 is not a new address 



The ADD_ADDR 0 with the address from the initial subflow should not be
considered as a new address: this is not something new. If the host
receives it, it simply means that the address is available again.

When receiving an ADD_ADDR for the ID 0, the PM already doesn't consider
it as new by not incrementing the 'add_addr_accepted' counter. But the
'accept_addr' might not be set if the limit has already been reached:
this can be bypassed in this case. But before, it is important to check
that this ADD_ADDR for the ID 0 is for the same address as the initial
subflow. If not, it is not something that should happen, and the
ADD_ADDR can be ignored.

Note that if an ADD_ADDR is received while there is already a subflow
opened using the same address, this ADD_ADDR is ignored as well. It
means that if multiple ADD_ADDR for ID 0 are received, there will not be
any duplicated subflows created by the client.

Fixes: d0876b22 ("mptcp: add the incoming RM_ADDR support")
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 20ccc7c5

net/mptcp/pm.c

+3 −1
Original line number Diff line number Diff line
@@ -226,7 +226,9 @@ void mptcp_pm_add_addr_received(const struct sock *ssk, 
		} else {

			__MPTCP_INC_STATS(sock_net((struct sock *)msk), MPTCP_MIB_ADDADDRDROP);

		}

	} else if (!READ_ONCE(pm->accept_addr)) {

	/* id0 should not have a different address */

	} else if ((addr->id == 0 && !mptcp_pm_nl_is_init_remote_addr(msk, addr)) ||

		   (addr->id > 0 && !READ_ONCE(pm->accept_addr))) {

		mptcp_pm_announce_addr(msk, addr, true);

		mptcp_pm_add_addr_send_ack(msk);

	} else if (mptcp_pm_schedule_work(msk, MPTCP_PM_ADD_ADDR_RECEIVED)) {

net/mptcp/pm_netlink.c

+9 −0
Original line number Diff line number Diff line
@@ -760,6 +760,15 @@ static void mptcp_pm_nl_add_addr_received(struct mptcp_sock *msk) 
	}

}



bool mptcp_pm_nl_is_init_remote_addr(struct mptcp_sock *msk,

				     const struct mptcp_addr_info *remote)

{

	struct mptcp_addr_info mpc_remote;



	remote_address((struct sock_common *)msk, &mpc_remote);

	return mptcp_addresses_equal(&mpc_remote, remote, remote->port);

}



void mptcp_pm_nl_addr_send_ack(struct mptcp_sock *msk)

{

	struct mptcp_subflow_context *subflow;

net/mptcp/protocol.h

+2 −0
Original line number Diff line number Diff line
@@ -993,6 +993,8 @@ void mptcp_pm_add_addr_received(const struct sock *ssk, 
void mptcp_pm_add_addr_echoed(struct mptcp_sock *msk,

			      const struct mptcp_addr_info *addr);

void mptcp_pm_add_addr_send_ack(struct mptcp_sock *msk);

bool mptcp_pm_nl_is_init_remote_addr(struct mptcp_sock *msk,

				     const struct mptcp_addr_info *remote);

void mptcp_pm_nl_addr_send_ack(struct mptcp_sock *msk);

void mptcp_pm_rm_addr_received(struct mptcp_sock *msk,

			       const struct mptcp_rm_list *rm_list);