Commit 1b7b7f21 authored by Geliang Tang's avatar Geliang Tang
Browse files

mptcp: get addr in userspace pm list 

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



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

This patch renames mptcp_pm_nl_get_addr_doit() as a dedicated in-kernel
netlink PM get addr function mptcp_pm_nl_get_addr(). and invoke a new
wrapper mptcp_pm_get_addr() in mptcp_pm_nl_get_addr_doit.

If a token is gotten in the wrapper, that means a userspace PM is used.
So invoke mptcp_userspace_pm_get_addr() to get addr in userspace PM list.
Otherwise, invoke mptcp_pm_nl_get_addr().

Signed-off-by: default avatarGeliang Tang <tanggeliang@kylinos.cn>
Reviewed-by: default avatarMatthieu Baerts (NGI0) <matttbe@kernel.org>
Reviewed-by: default avatarMat Martineau <martineau@kernel.org>
Signed-off-by: default avatarMatthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Reviewed-by: default avatarJackie Liu <liuyun01@kylinos.cn>
Signed-off-by: default avatarGeliang Tang <tanggeliang@kylinos.cn>
parent 06abc2ff

net/mptcp/pm.c

+7 −0
Original line number Diff line number Diff line
@@ -430,6 +430,13 @@ int mptcp_pm_get_flags_and_ifindex_by_id(struct mptcp_sock *msk, unsigned int id 
	return mptcp_pm_nl_get_flags_and_ifindex_by_id(msk, id, flags, ifindex);

}



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

{

	if (info->attrs[MPTCP_PM_ATTR_TOKEN])

		return mptcp_userspace_pm_get_addr(skb, info);

	return mptcp_pm_nl_get_addr(skb, info);

}



int mptcp_pm_dump_addr(struct sk_buff *msg, struct netlink_callback *cb)

{

	const struct genl_info *info = genl_info_dump(cb);

net/mptcp/pm_netlink.c

+6 −1
Original line number Diff line number Diff line
@@ -1793,7 +1793,7 @@ int mptcp_nl_fill_addr(struct sk_buff *skb, 
	return -EMSGSIZE;

}



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

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

{

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

	struct pm_nl_pernet *pernet = genl_info_pm_nl(info);
@@ -1843,6 +1843,11 @@ int mptcp_pm_nl_get_addr_doit(struct sk_buff *skb, struct genl_info *info) 
	return ret;

}



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

{

	return mptcp_pm_get_addr(skb, info);

}



int mptcp_pm_nl_dump_addr(struct sk_buff *msg,

			  struct netlink_callback *cb)

{

net/mptcp/protocol.h

+2 −0
Original line number Diff line number Diff line
@@ -1074,6 +1074,8 @@ int mptcp_pm_nl_dump_addr(struct sk_buff *msg, 
			  struct netlink_callback *cb);

int mptcp_userspace_pm_dump_addr(struct sk_buff *msg,

				 struct netlink_callback *cb);

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

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

int mptcp_userspace_pm_get_addr(struct sk_buff *skb,

				struct genl_info *info);