Commit f012d796 authored by Geliang Tang's avatar Geliang Tang Committed by David S. Miller
Browse files

mptcp: check addrs list in userspace_pm_get_local_id 



Before adding a new entry in mptcp_userspace_pm_get_local_id(), it's
better to check whether this address is already in userspace pm local
address list. If it's in the list, no need to add a new entry, just
return it's address ID and use this address.

Fixes: 8b201370 ("mptcp: read attributes of addr entries managed by userspace PMs")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarGeliang Tang <geliang.tang@linux.dev>
Reviewed-by: default avatarMat Martineau <martineau@kernel.org>
Signed-off-by: default avatarMatthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e4a0fa47

net/mptcp/pm_userspace.c

+12 −1
Original line number Diff line number Diff line
@@ -130,10 +130,21 @@ int mptcp_userspace_pm_get_flags_and_ifindex_by_id(struct mptcp_sock *msk, 
int mptcp_userspace_pm_get_local_id(struct mptcp_sock *msk,

				    struct mptcp_addr_info *skc)

{

	struct mptcp_pm_addr_entry new_entry;

	struct mptcp_pm_addr_entry *entry = NULL, *e, new_entry;

	__be16 msk_sport =  ((struct inet_sock *)

			     inet_sk((struct sock *)msk))->inet_sport;



	spin_lock_bh(&msk->pm.lock);

	list_for_each_entry(e, &msk->pm.userspace_pm_local_addr_list, list) {

		if (mptcp_addresses_equal(&e->addr, skc, false)) {

			entry = e;

			break;

		}

	}

	spin_unlock_bh(&msk->pm.lock);

	if (entry)

		return entry->addr.id;



	memset(&new_entry, 0, sizeof(struct mptcp_pm_addr_entry));

	new_entry.addr = *skc;

	new_entry.addr.id = 0;