Commit c2903379 authored by Geliang Tang's avatar Geliang Tang
Browse files

mptcp: dump addrs in userspace pm list 

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



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

This patch renames mptcp_pm_nl_get_addr_dumpit() as a dedicated in-kernel
netlink PM dump addrs function mptcp_pm_nl_dump_addr(), and invoke a newly
added wrapper mptcp_pm_dump_addr() in mptcp_pm_nl_get_addr_dumpit().

Invoke in-kernel PM dump addrs function mptcp_pm_nl_dump_addr() or
userspace PM dump addrs function mptcp_userspace_pm_dump_addr() based on
whether the token parameter is passed in or not in the wrapper.

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 cc84713a

net/mptcp/pm.c

+9 −0
Original line number Diff line number Diff line
@@ -430,6 +430,15 @@ 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_dump_addr(struct sk_buff *msg, struct netlink_callback *cb)

{

	const struct genl_info *info = genl_info_dump(cb);



	if (info->attrs[MPTCP_PM_ATTR_TOKEN])

		return mptcp_userspace_pm_dump_addr(msg, 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)

net/mptcp/pm_netlink.c

+8 −2
Original line number Diff line number Diff line
@@ -1843,7 +1843,7 @@ int mptcp_pm_nl_get_addr_doit(struct sk_buff *skb, struct genl_info *info) 
	return ret;

}



int mptcp_pm_nl_get_addr_dumpit(struct sk_buff *msg,

int mptcp_pm_nl_dump_addr(struct sk_buff *msg,

			  struct netlink_callback *cb)

{

	struct net *net = sock_net(msg->sk);
@@ -1886,6 +1886,12 @@ int mptcp_pm_nl_get_addr_dumpit(struct sk_buff *msg, 
	return msg->len;

}



int mptcp_pm_nl_get_addr_dumpit(struct sk_buff *msg,

				struct netlink_callback *cb)

{

	return mptcp_pm_dump_addr(msg, cb);

}



static int parse_limit(struct genl_info *info, int id, unsigned int *limit)

{

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

net/mptcp/protocol.h

+3 −0
Original line number Diff line number Diff line
@@ -1069,6 +1069,9 @@ bool mptcp_pm_rm_addr_signal(struct mptcp_sock *msk, unsigned int remaining, 
int mptcp_pm_get_local_id(struct mptcp_sock *msk, struct sock_common *skc);

int mptcp_pm_nl_get_local_id(struct mptcp_sock *msk, struct mptcp_addr_info *skc);

int mptcp_userspace_pm_get_local_id(struct mptcp_sock *msk, struct mptcp_addr_info *skc);

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

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