Commit de435edf authored by Paolo Abeni's avatar Paolo Abeni Committed by ZhangPeng
Browse files

mptcp: fix user-space PM announced address accounting 

stable inclusion
from stable-v6.6.45
commit 201b76f6245346de61a32359e0644948441a2e7a
bugzilla: https://gitee.com/openeuler/kernel/issues/IAJEIR

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=201b76f6245346de61a32359e0644948441a2e7a



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

commit 167b93258d1e2230ee3e8a97669b4db4cc9e90aa upstream.

Currently the per-connection announced address counter is never
decreased. When the user-space PM is in use, this just affect
the information exposed via diag/sockopt, but it could still foul
the PM to wrong decision.

Add the missing accounting for the user-space PM's sake.

Fixes: 8b1c94da ("mptcp: only send RM_ADDR in nl_cmd_remove")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
Reviewed-by: default avatarMatthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: default avatarMatthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarZhangPeng <zhangpeng362@huawei.com>
parent 7927835a

net/mptcp/pm_netlink.c

+13 −4
Original line number Diff line number Diff line
@@ -1542,16 +1542,25 @@ void mptcp_pm_remove_addrs(struct mptcp_sock *msk, struct list_head *rm_list) 
{

	struct mptcp_rm_list alist = { .nr = 0 };

	struct mptcp_pm_addr_entry *entry;

	int anno_nr = 0;



	list_for_each_entry(entry, rm_list, list) {

		if ((remove_anno_list_by_saddr(msk, &entry->addr) ||

		     lookup_subflow_by_saddr(&msk->conn_list, &entry->addr)) &&

		    alist.nr < MPTCP_RM_IDS_MAX)

		if (alist.nr >= MPTCP_RM_IDS_MAX)

			break;



		/* only delete if either announced or matching a subflow */

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

			anno_nr++;

		else if (!lookup_subflow_by_saddr(&msk->conn_list,

						  &entry->addr))

			continue;



		alist.ids[alist.nr++] = entry->addr.id;

	}



	if (alist.nr) {

		spin_lock_bh(&msk->pm.lock);

		msk->pm.add_addr_signaled -= anno_nr;

		mptcp_pm_remove_addr(msk, &alist);

		spin_unlock_bh(&msk->pm.lock);

	}