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

mptcp: fix NL PM announced address accounting 

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

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



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

commit 4b317e0eb287bd30a1b329513531157c25e8b692 upstream.

Currently the per connection announced address counter is never
decreased. As a consequence, after connection establishment, if
the NL PM deletes an endpoint and adds a new/different one, no
additional subflow is created for the new endpoint even if the
current limits allow that.

Address the issue properly updating the signaled address counter
every time the NL PM removes such addresses.

Fixes: 01cacb00 ("mptcp: add netlink-based PM")
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 96a9fa7f

net/mptcp/pm_netlink.c

+6 −4
Original line number Diff line number Diff line
@@ -1409,6 +1409,7 @@ static bool mptcp_pm_remove_anno_addr(struct mptcp_sock *msk, 
	ret = remove_anno_list_by_saddr(msk, addr);

	if (ret || force) {

		spin_lock_bh(&msk->pm.lock);

		msk->pm.add_addr_signaled -= ret;

		mptcp_pm_remove_addr(msk, &list);

		spin_unlock_bh(&msk->pm.lock);

	}
@@ -1573,17 +1574,18 @@ void mptcp_pm_remove_addrs_and_subflows(struct mptcp_sock *msk, 
	struct mptcp_pm_addr_entry *entry;



	list_for_each_entry(entry, rm_list, list) {

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

		    slist.nr < MPTCP_RM_IDS_MAX)

		if (slist.nr < MPTCP_RM_IDS_MAX &&

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

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



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

		    alist.nr < MPTCP_RM_IDS_MAX)

		if (alist.nr < MPTCP_RM_IDS_MAX &&

		    remove_anno_list_by_saddr(msk, &entry->addr))

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

	}



	if (alist.nr) {

		spin_lock_bh(&msk->pm.lock);

		msk->pm.add_addr_signaled -= alist.nr;

		mptcp_pm_remove_addr(msk, &alist);

		spin_unlock_bh(&msk->pm.lock);

	}