Commit c4fd1f6a authored by Geliang Tang's avatar Geliang Tang
Browse files

mptcp: drop lookup_by_id in lookup_addr 

mainline inclusion
from mainline-v6.9-rc1
commit af250c27ea1c404e210fc3a308b20f772df584d6
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I9VYQ9
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=af250c27ea1c404e210fc3a308b20f772df584d6



--------------------------------

When the lookup_by_id parameter of __lookup_addr() is true, it's the same
as __lookup_addr_by_id(), it can be replaced by __lookup_addr_by_id()
directly. So drop this parameter, let __lookup_addr() only looks up address
on the local address list by comparing addresses in it, not address ids.

Signed-off-by: default avatarGeliang Tang <tanggeliang@kylinos.cn>
Reviewed-by: default avatarMatthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: default avatarMatthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://lore.kernel.org/r/20240305-upstream-net-next-20240304-mptcp-misc-cleanup-v1-4-c436ba5e569b@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Reviewed-by: default avatarJackie Liu <liuyun01@kylinos.cn>
Signed-off-by: default avatarGeliang Tang <tanggeliang@kylinos.cn>
parent 29ed76fd

net/mptcp/pm_netlink.c

+5 −7
Original line number Diff line number Diff line
@@ -515,15 +515,12 @@ __lookup_addr_by_id(struct pm_nl_pernet *pernet, unsigned int id) 
}



static struct mptcp_pm_addr_entry *

__lookup_addr(struct pm_nl_pernet *pernet, const struct mptcp_addr_info *info,

	      bool lookup_by_id)

__lookup_addr(struct pm_nl_pernet *pernet, const struct mptcp_addr_info *info)

{

	struct mptcp_pm_addr_entry *entry;



	list_for_each_entry(entry, &pernet->local_addr_list, list) {

		if ((!lookup_by_id &&

		     mptcp_addresses_equal(&entry->addr, info, entry->addr.port)) ||

		    (lookup_by_id && entry->addr.id == info->id))

		if (mptcp_addresses_equal(&entry->addr, info, entry->addr.port))

			return entry;

	}

	return NULL;
@@ -554,7 +551,7 @@ static void mptcp_pm_create_subflow_or_signal_addr(struct mptcp_sock *msk) 


		mptcp_local_address((struct sock_common *)msk->first, &mpc_addr);

		rcu_read_lock();

		entry = __lookup_addr(pernet, &mpc_addr, false);

		entry = __lookup_addr(pernet, &mpc_addr);

		if (entry) {

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

			msk->mpc_endpoint_id = entry->addr.id;
@@ -2035,7 +2032,8 @@ int mptcp_pm_nl_set_flags(struct sk_buff *skb, struct genl_info *info) 
		bkup = 1;



	spin_lock_bh(&pernet->lock);

	entry = __lookup_addr(pernet, &addr.addr, lookup_by_id);

	entry = lookup_by_id ? __lookup_addr_by_id(pernet, addr.addr.id) :

			       __lookup_addr(pernet, &addr.addr);

	if (!entry) {

		spin_unlock_bh(&pernet->lock);

		GENL_SET_ERR_MSG(info, "address not found");