Commit 7b6c0843 authored by Geliang Tang's avatar Geliang Tang Committed by Wang Liang
Browse files

mptcp: export lookup_anno_list_by_saddr 

mainline inclusion
from mainline-v5.13-rc1
commit d88c476f
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IAU9JW
CVE: CVE-2024-46858

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=d88c476f4a7dd69a2588470f6c4f8b663efa16c6



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

This patch exported the static function lookup_anno_list_by_saddr, and
renamed it to mptcp_lookup_anno_list_by_saddr.

Signed-off-by: default avatarGeliang Tang <geliangtang@gmail.com>
Signed-off-by: default avatarMat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarWang Liang <wangliang74@huawei.com>
parent 33a5644b

net/mptcp/pm_netlink.c

+5 −5
Original line number Diff line number Diff line
@@ -195,8 +195,8 @@ static void check_work_pending(struct mptcp_sock *msk) 
		WRITE_ONCE(msk->pm.work_pending, false);

}



static struct mptcp_pm_add_entry *

lookup_anno_list_by_saddr(struct mptcp_sock *msk,

struct mptcp_pm_add_entry *

mptcp_lookup_anno_list_by_saddr(struct mptcp_sock *msk,

				struct mptcp_addr_info *addr)

{

	struct mptcp_pm_add_entry *entry;
@@ -256,7 +256,7 @@ mptcp_pm_del_add_timer(struct mptcp_sock *msk, 
	struct sock *sk = (struct sock *)msk;



	spin_lock_bh(&msk->pm.lock);

	entry = lookup_anno_list_by_saddr(msk, addr);

	entry = mptcp_lookup_anno_list_by_saddr(msk, addr);

	if (entry)

		entry->retrans_times = ADD_ADDR_RETRANS_MAX;

	spin_unlock_bh(&msk->pm.lock);
@@ -273,7 +273,7 @@ static bool mptcp_pm_alloc_anno_list(struct mptcp_sock *msk, 
	struct mptcp_pm_add_entry *add_entry = NULL;

	struct sock *sk = (struct sock *)msk;



	if (lookup_anno_list_by_saddr(msk, &entry->addr))

	if (mptcp_lookup_anno_list_by_saddr(msk, &entry->addr))

		return false;



	add_entry = kmalloc(sizeof(*add_entry), GFP_ATOMIC);

net/mptcp/protocol.h

+3 −0
Original line number Diff line number Diff line
@@ -450,6 +450,9 @@ void mptcp_pm_free_anno_list(struct mptcp_sock *msk); 
struct mptcp_pm_add_entry *

mptcp_pm_del_add_timer(struct mptcp_sock *msk,

		       struct mptcp_addr_info *addr);

struct mptcp_pm_add_entry *

mptcp_lookup_anno_list_by_saddr(struct mptcp_sock *msk,

				struct mptcp_addr_info *addr);



int mptcp_pm_announce_addr(struct mptcp_sock *msk,

			   const struct mptcp_addr_info *addr,