Commit eb359f41 authored by Geliang Tang's avatar Geliang Tang Committed by Wentao Guan
Browse files

mptcp: update local address flags when setting it 

mainline inclusion
from mainline-v6.12
commit e0266319413d5d687ba7b6df7ca99e4b9724a4f2
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IBI1RP

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



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

Just like in-kernel pm, when userspace pm does set_flags, it needs to send
out MP_PRIO signal, and also modify the flags of the corresponding address
entry in the local address list. This patch implements the missing logic.

Traverse all address entries on userspace_pm_local_addr_list to find the
local address entry, if bkup is true, set the flags of this entry with
FLAG_BACKUP, otherwise, clear FLAG_BACKUP.

Fixes: 892f396c ("mptcp: netlink: issue MP_PRIO signals from userspace PMs")
Cc: stable@vger.kernel.org
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://patch.msgid.link/20241112-net-mptcp-misc-6-12-pm-v1-1-b835580cefa8@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
(cherry picked from commit e0266319413d5d687ba7b6df7ca99e4b9724a4f2)
[ Conflicts in pm_userspace.c, because commit 6a42477fe449 ("mptcp:
      update set_flags interfaces"), is in this version, use upstream ver ]
Signed-off-by: default avatarWentao Guan <guanwentao@uniontech.com>
parent b632f225

net/mptcp/pm_userspace.c

+12 −0
Original line number Diff line number Diff line
@@ -558,6 +558,7 @@ int mptcp_userspace_pm_set_flags(struct sk_buff *skb, struct genl_info *info) 
	struct nlattr *token = info->attrs[MPTCP_PM_ATTR_TOKEN];

	struct nlattr *attr = info->attrs[MPTCP_PM_ATTR_ADDR];

	struct net *net = sock_net(skb->sk);

	struct mptcp_pm_addr_entry *entry;

	struct mptcp_sock *msk;

	int ret = -EINVAL;

	struct sock *sk;
@@ -599,6 +600,17 @@ int mptcp_userspace_pm_set_flags(struct sk_buff *skb, struct genl_info *info) 
	if (loc.flags & MPTCP_PM_ADDR_FLAG_BACKUP)

		bkup = 1;



	spin_lock_bh(&msk->pm.lock);

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

		if (mptcp_addresses_equal(&entry->addr, &loc.addr, false)) {

			if (bkup)

				entry->flags |= MPTCP_PM_ADDR_FLAG_BACKUP;

			else

				entry->flags &= ~MPTCP_PM_ADDR_FLAG_BACKUP;

		}

	}

	spin_unlock_bh(&msk->pm.lock);



	lock_sock(sk);

	ret = mptcp_pm_nl_mp_prio_send_ack(msk, &loc.addr, &rem.addr, bkup);

	release_sock(sk);