Commit 3e2e3a5a authored by Geliang Tang's avatar Geliang Tang
Browse files

mptcp: update set_flags interfaces 

mainline inclusion
from mainline-v6.9-rc1
commit 6a42477fe4491e454aaeabfed5708d1eff5ff2ad
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=6a42477fe4491e454aaeabfed5708d1eff5ff2ad



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

This patch updates set_flags interfaces, make it more similar to the
interfaces of dump_addr and get_addr:

 mptcp_pm_set_flags(struct sk_buff *skb, struct genl_info *info)
 mptcp_pm_nl_set_flags(struct sk_buff *skb, struct genl_info *info)
 mptcp_userspace_pm_set_flags(struct sk_buff *skb, struct genl_info *info)

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-2-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 06fc4b1c

net/mptcp/pm.c

+4 −6
Original line number Diff line number Diff line
@@ -438,13 +438,11 @@ int mptcp_pm_dump_addr(struct sk_buff *msg, struct netlink_callback *cb) 
	return mptcp_pm_nl_dump_addr(msg, cb);

}



int mptcp_pm_set_flags(struct net *net, struct nlattr *token,

		       struct mptcp_pm_addr_entry *loc,

		       struct mptcp_pm_addr_entry *rem, u8 bkup)

int mptcp_pm_set_flags(struct sk_buff *skb, struct genl_info *info)

{

	if (token)

		return mptcp_userspace_pm_set_flags(net, token, loc, rem, bkup);

	return mptcp_pm_nl_set_flags(net, loc, bkup);

	if (info->attrs[MPTCP_PM_ATTR_TOKEN])

		return mptcp_userspace_pm_set_flags(skb, info);

	return mptcp_pm_nl_set_flags(skb, info);

}



void mptcp_pm_subflow_chk_stale(const struct mptcp_sock *msk, struct sock *ssk)

net/mptcp/pm_netlink.c

+25 −33
Original line number Diff line number Diff line
@@ -2004,66 +2004,58 @@ static int mptcp_nl_set_flags(struct net *net, 
	return ret;

}



int mptcp_pm_nl_set_flags(struct net *net, struct mptcp_pm_addr_entry *addr, u8 bkup)

int mptcp_pm_nl_set_flags(struct sk_buff *skb, struct genl_info *info)

{

	struct pm_nl_pernet *pernet = pm_nl_get_pernet(net);

	struct mptcp_pm_addr_entry addr = { .addr = { .family = AF_UNSPEC }, };

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

	u8 changed, mask = MPTCP_PM_ADDR_FLAG_BACKUP |

			   MPTCP_PM_ADDR_FLAG_FULLMESH;

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

	struct mptcp_pm_addr_entry *entry;

	struct pm_nl_pernet *pernet;

	u8 lookup_by_id = 0;

	u8 bkup = 0;

	int ret;



	pernet = pm_nl_get_pernet(net);



	if (addr->addr.family == AF_UNSPEC) {

	ret = mptcp_pm_parse_entry(attr, info, false, &addr);

	if (ret < 0)

		return ret;



	if (addr.addr.family == AF_UNSPEC) {

		lookup_by_id = 1;

		if (!addr->addr.id)

		if (!addr.addr.id)

			return -EOPNOTSUPP;

	}



	if (addr.flags & MPTCP_PM_ADDR_FLAG_BACKUP)

		bkup = 1;



	spin_lock_bh(&pernet->lock);

	entry = __lookup_addr(pernet, &addr->addr, lookup_by_id);

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

	if (!entry) {

		spin_unlock_bh(&pernet->lock);

		return -EINVAL;

	}

	if ((addr->flags & MPTCP_PM_ADDR_FLAG_FULLMESH) &&

	if ((addr.flags & MPTCP_PM_ADDR_FLAG_FULLMESH) &&

	    (entry->flags & MPTCP_PM_ADDR_FLAG_SIGNAL)) {

		spin_unlock_bh(&pernet->lock);

		return -EINVAL;

	}



	changed = (addr->flags ^ entry->flags) & mask;

	entry->flags = (entry->flags & ~mask) | (addr->flags & mask);

	*addr = *entry;

	changed = (addr.flags ^ entry->flags) & mask;

	entry->flags = (entry->flags & ~mask) | (addr.flags & mask);

	addr = *entry;

	spin_unlock_bh(&pernet->lock);



	mptcp_nl_set_flags(net, &addr->addr, bkup, changed);

	mptcp_nl_set_flags(net, &addr.addr, bkup, changed);

	return 0;

}



int mptcp_pm_nl_set_flags_doit(struct sk_buff *skb, struct genl_info *info)

{

	struct mptcp_pm_addr_entry remote = { .addr = { .family = AF_UNSPEC }, };

	struct mptcp_pm_addr_entry addr = { .addr = { .family = AF_UNSPEC }, };

	struct nlattr *attr_rem = info->attrs[MPTCP_PM_ATTR_ADDR_REMOTE];

	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);

	u8 bkup = 0;

	int ret;



	ret = mptcp_pm_parse_entry(attr, info, false, &addr);

	if (ret < 0)

		return ret;



	if (attr_rem) {

		ret = mptcp_pm_parse_entry(attr_rem, info, false, &remote);

		if (ret < 0)

			return ret;

	}



	if (addr.flags & MPTCP_PM_ADDR_FLAG_BACKUP)

		bkup = 1;



	return mptcp_pm_set_flags(net, token, &addr, &remote, bkup);

	return mptcp_pm_set_flags(skb, info);

}



static void mptcp_nl_mcast_send(struct net *net, struct sk_buff *nlskb, gfp_t gfp)

net/mptcp/pm_userspace.c

+26 −6
Original line number Diff line number Diff line
@@ -545,14 +545,19 @@ int mptcp_pm_nl_subflow_destroy_doit(struct sk_buff *skb, struct genl_info *info 
	return err;

}



int mptcp_userspace_pm_set_flags(struct net *net, struct nlattr *token,

				 struct mptcp_pm_addr_entry *loc,

				 struct mptcp_pm_addr_entry *rem, u8 bkup)

int mptcp_userspace_pm_set_flags(struct sk_buff *skb, struct genl_info *info)

{

	struct mptcp_pm_addr_entry loc = { .addr = { .family = AF_UNSPEC }, };

	struct mptcp_pm_addr_entry rem = { .addr = { .family = AF_UNSPEC }, };

	struct nlattr *attr_rem = info->attrs[MPTCP_PM_ATTR_ADDR_REMOTE];

	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_sock *msk;

	int ret = -EINVAL;

	struct sock *sk;

	u32 token_val;

	u8 bkup = 0;



	token_val = nla_get_u32(token);
@@ -565,12 +570,27 @@ int mptcp_userspace_pm_set_flags(struct net *net, struct nlattr *token, 
	if (!mptcp_pm_is_userspace(msk))

		goto set_flags_err;



	if (loc->addr.family == AF_UNSPEC ||

	    rem->addr.family == AF_UNSPEC)

	ret = mptcp_pm_parse_entry(attr, info, false, &loc);

	if (ret < 0)

		goto set_flags_err;



	if (attr_rem) {

		ret = mptcp_pm_parse_entry(attr_rem, info, false, &rem);

		if (ret < 0)

			goto set_flags_err;

	}



	if (loc.addr.family == AF_UNSPEC ||

	    rem.addr.family == AF_UNSPEC) {

		ret = -EINVAL;

		goto set_flags_err;

	}



	if (loc.flags & MPTCP_PM_ADDR_FLAG_BACKUP)

		bkup = 1;



	lock_sock(sk);

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

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

	release_sock(sk);



set_flags_err:

net/mptcp/protocol.h

+3 −7
Original line number Diff line number Diff line
@@ -976,13 +976,9 @@ int mptcp_pm_nl_get_flags_and_ifindex_by_id(struct mptcp_sock *msk, unsigned int 
int mptcp_userspace_pm_get_flags_and_ifindex_by_id(struct mptcp_sock *msk,

						   unsigned int id,

						   u8 *flags, int *ifindex);

int mptcp_pm_set_flags(struct net *net, struct nlattr *token,

		       struct mptcp_pm_addr_entry *loc,

		       struct mptcp_pm_addr_entry *rem, u8 bkup);

int mptcp_pm_nl_set_flags(struct net *net, struct mptcp_pm_addr_entry *addr, u8 bkup);

int mptcp_userspace_pm_set_flags(struct net *net, struct nlattr *token,

				 struct mptcp_pm_addr_entry *loc,

				 struct mptcp_pm_addr_entry *rem, u8 bkup);

int mptcp_pm_set_flags(struct sk_buff *skb, struct genl_info *info);

int mptcp_pm_nl_set_flags(struct sk_buff *skb, struct genl_info *info);

int mptcp_userspace_pm_set_flags(struct sk_buff *skb, struct genl_info *info);

int mptcp_pm_announce_addr(struct mptcp_sock *msk,

			   const struct mptcp_addr_info *addr,

			   bool echo);