Commit 9a06e026 authored by Geliang Tang's avatar Geliang Tang Committed by Geliang Tang
Browse files

net: mptcp: use policy generated by YAML spec 

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

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

generated with:

 $ ./tools/net/ynl/ynl-gen-c.py --mode kernel \
 > --spec Documentation/netlink/specs/mptcp.yaml --source \
 > -o net/mptcp/mptcp_pm_gen.c
 $ ./tools/net/ynl/ynl-gen-c.py --mode kernel \
 > --spec Documentation/netlink/specs/mptcp.yaml --header \
 > -o net/mptcp/mptcp_pm_gen.h

Closes: https://github.com/multipath-tcp/mptcp_net-next/issues/340


Acked-by: default avatarPaolo Abeni <pabeni@redhat.com>
Signed-off-by: default avatarDavide Caratti <dcaratti@redhat.com>
Signed-off-by: default avatarMat Martineau <martineau@kernel.org>
Link: https://lore.kernel.org/r/20231023-send-net-next-20231023-1-v2-7-16b1f701f900@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 0319c026

net/mptcp/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -2,7 +2,8 @@ 
obj-$(CONFIG_MPTCP) += mptcp.o



mptcp-y := protocol.o subflow.o options.o token.o crypto.o ctrl.o pm.o diag.o \

	   mib.o pm_netlink.o sockopt.o pm_userspace.o fastopen.o sched.o

	   mib.o pm_netlink.o sockopt.o pm_userspace.o fastopen.o sched.o \

	   mptcp_pm_gen.o



obj-$(CONFIG_SYN_COOKIES) += syncookies.o

obj-$(CONFIG_INET_MPTCP_DIAG) += mptcp_diag.o

net/mptcp/mptcp_pm_gen.c

0 → 100644
+179 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause)

/* Do not edit directly, auto-generated from: */

/*	Documentation/netlink/specs/mptcp.yaml */

/* YNL-GEN kernel source */



#include <net/netlink.h>

#include <net/genetlink.h>



#include "mptcp_pm_gen.h"



#include <uapi/linux/mptcp_pm.h>



/* Common nested types */

const struct nla_policy mptcp_pm_address_nl_policy[MPTCP_PM_ADDR_ATTR_IF_IDX + 1] = {

	[MPTCP_PM_ADDR_ATTR_FAMILY] = { .type = NLA_U16, },

	[MPTCP_PM_ADDR_ATTR_ID] = { .type = NLA_U8, },

	[MPTCP_PM_ADDR_ATTR_ADDR4] = { .type = NLA_U32, },

	[MPTCP_PM_ADDR_ATTR_ADDR6] = NLA_POLICY_EXACT_LEN(16),

	[MPTCP_PM_ADDR_ATTR_PORT] = { .type = NLA_U16, },

	[MPTCP_PM_ADDR_ATTR_FLAGS] = { .type = NLA_U32, },

	[MPTCP_PM_ADDR_ATTR_IF_IDX] = { .type = NLA_S32, },

};



/* MPTCP_PM_CMD_ADD_ADDR - do */

const struct nla_policy mptcp_pm_add_addr_nl_policy[MPTCP_PM_ENDPOINT_ADDR + 1] = {

	[MPTCP_PM_ENDPOINT_ADDR] = NLA_POLICY_NESTED(mptcp_pm_address_nl_policy),

};



/* MPTCP_PM_CMD_DEL_ADDR - do */

const struct nla_policy mptcp_pm_del_addr_nl_policy[MPTCP_PM_ENDPOINT_ADDR + 1] = {

	[MPTCP_PM_ENDPOINT_ADDR] = NLA_POLICY_NESTED(mptcp_pm_address_nl_policy),

};



/* MPTCP_PM_CMD_GET_ADDR - do */

const struct nla_policy mptcp_pm_get_addr_nl_policy[MPTCP_PM_ENDPOINT_ADDR + 1] = {

	[MPTCP_PM_ENDPOINT_ADDR] = NLA_POLICY_NESTED(mptcp_pm_address_nl_policy),

};



/* MPTCP_PM_CMD_FLUSH_ADDRS - do */

const struct nla_policy mptcp_pm_flush_addrs_nl_policy[MPTCP_PM_ENDPOINT_ADDR + 1] = {

	[MPTCP_PM_ENDPOINT_ADDR] = NLA_POLICY_NESTED(mptcp_pm_address_nl_policy),

};



/* MPTCP_PM_CMD_SET_LIMITS - do */

const struct nla_policy mptcp_pm_set_limits_nl_policy[MPTCP_PM_ATTR_SUBFLOWS + 1] = {

	[MPTCP_PM_ATTR_RCV_ADD_ADDRS] = { .type = NLA_U32, },

	[MPTCP_PM_ATTR_SUBFLOWS] = { .type = NLA_U32, },

};



/* MPTCP_PM_CMD_GET_LIMITS - do */

const struct nla_policy mptcp_pm_get_limits_nl_policy[MPTCP_PM_ATTR_SUBFLOWS + 1] = {

	[MPTCP_PM_ATTR_RCV_ADD_ADDRS] = { .type = NLA_U32, },

	[MPTCP_PM_ATTR_SUBFLOWS] = { .type = NLA_U32, },

};



/* MPTCP_PM_CMD_SET_FLAGS - do */

const struct nla_policy mptcp_pm_set_flags_nl_policy[MPTCP_PM_ATTR_ADDR_REMOTE + 1] = {

	[MPTCP_PM_ATTR_ADDR] = NLA_POLICY_NESTED(mptcp_pm_address_nl_policy),

	[MPTCP_PM_ATTR_TOKEN] = { .type = NLA_U32, },

	[MPTCP_PM_ATTR_ADDR_REMOTE] = NLA_POLICY_NESTED(mptcp_pm_address_nl_policy),

};



/* MPTCP_PM_CMD_ANNOUNCE - do */

const struct nla_policy mptcp_pm_announce_nl_policy[MPTCP_PM_ATTR_TOKEN + 1] = {

	[MPTCP_PM_ATTR_ADDR] = NLA_POLICY_NESTED(mptcp_pm_address_nl_policy),

	[MPTCP_PM_ATTR_TOKEN] = { .type = NLA_U32, },

};



/* MPTCP_PM_CMD_REMOVE - do */

const struct nla_policy mptcp_pm_remove_nl_policy[MPTCP_PM_ATTR_LOC_ID + 1] = {

	[MPTCP_PM_ATTR_TOKEN] = { .type = NLA_U32, },

	[MPTCP_PM_ATTR_LOC_ID] = { .type = NLA_U8, },

};



/* MPTCP_PM_CMD_SUBFLOW_CREATE - do */

const struct nla_policy mptcp_pm_subflow_create_nl_policy[MPTCP_PM_ATTR_ADDR_REMOTE + 1] = {

	[MPTCP_PM_ATTR_ADDR] = NLA_POLICY_NESTED(mptcp_pm_address_nl_policy),

	[MPTCP_PM_ATTR_TOKEN] = { .type = NLA_U32, },

	[MPTCP_PM_ATTR_ADDR_REMOTE] = NLA_POLICY_NESTED(mptcp_pm_address_nl_policy),

};



/* MPTCP_PM_CMD_SUBFLOW_DESTROY - do */

const struct nla_policy mptcp_pm_subflow_destroy_nl_policy[MPTCP_PM_ATTR_ADDR_REMOTE + 1] = {

	[MPTCP_PM_ATTR_ADDR] = NLA_POLICY_NESTED(mptcp_pm_address_nl_policy),

	[MPTCP_PM_ATTR_TOKEN] = { .type = NLA_U32, },

	[MPTCP_PM_ATTR_ADDR_REMOTE] = NLA_POLICY_NESTED(mptcp_pm_address_nl_policy),

};



/* Ops table for mptcp_pm */

const struct genl_ops mptcp_pm_nl_ops[11] = {

	{

		.cmd		= MPTCP_PM_CMD_ADD_ADDR,

		.validate	= GENL_DONT_VALIDATE_STRICT,

		.doit		= mptcp_pm_nl_add_addr_doit,

		.policy		= mptcp_pm_add_addr_nl_policy,

		.maxattr	= MPTCP_PM_ENDPOINT_ADDR,

		.flags		= GENL_UNS_ADMIN_PERM,

	},

	{

		.cmd		= MPTCP_PM_CMD_DEL_ADDR,

		.validate	= GENL_DONT_VALIDATE_STRICT,

		.doit		= mptcp_pm_nl_del_addr_doit,

		.policy		= mptcp_pm_del_addr_nl_policy,

		.maxattr	= MPTCP_PM_ENDPOINT_ADDR,

		.flags		= GENL_UNS_ADMIN_PERM,

	},

	{

		.cmd		= MPTCP_PM_CMD_GET_ADDR,

		.validate	= GENL_DONT_VALIDATE_STRICT,

		.doit		= mptcp_pm_nl_get_addr_doit,

		.dumpit		= mptcp_pm_nl_get_addr_dumpit,

		.policy		= mptcp_pm_get_addr_nl_policy,

		.maxattr	= MPTCP_PM_ENDPOINT_ADDR,

		.flags		= GENL_UNS_ADMIN_PERM,

	},

	{

		.cmd		= MPTCP_PM_CMD_FLUSH_ADDRS,

		.validate	= GENL_DONT_VALIDATE_STRICT,

		.doit		= mptcp_pm_nl_flush_addrs_doit,

		.policy		= mptcp_pm_flush_addrs_nl_policy,

		.maxattr	= MPTCP_PM_ENDPOINT_ADDR,

		.flags		= GENL_UNS_ADMIN_PERM,

	},

	{

		.cmd		= MPTCP_PM_CMD_SET_LIMITS,

		.validate	= GENL_DONT_VALIDATE_STRICT,

		.doit		= mptcp_pm_nl_set_limits_doit,

		.policy		= mptcp_pm_set_limits_nl_policy,

		.maxattr	= MPTCP_PM_ATTR_SUBFLOWS,

		.flags		= GENL_UNS_ADMIN_PERM,

	},

	{

		.cmd		= MPTCP_PM_CMD_GET_LIMITS,

		.validate	= GENL_DONT_VALIDATE_STRICT,

		.doit		= mptcp_pm_nl_get_limits_doit,

		.policy		= mptcp_pm_get_limits_nl_policy,

		.maxattr	= MPTCP_PM_ATTR_SUBFLOWS,

	},

	{

		.cmd		= MPTCP_PM_CMD_SET_FLAGS,

		.validate	= GENL_DONT_VALIDATE_STRICT,

		.doit		= mptcp_pm_nl_set_flags_doit,

		.policy		= mptcp_pm_set_flags_nl_policy,

		.maxattr	= MPTCP_PM_ATTR_ADDR_REMOTE,

		.flags		= GENL_UNS_ADMIN_PERM,

	},

	{

		.cmd		= MPTCP_PM_CMD_ANNOUNCE,

		.validate	= GENL_DONT_VALIDATE_STRICT,

		.doit		= mptcp_pm_nl_announce_doit,

		.policy		= mptcp_pm_announce_nl_policy,

		.maxattr	= MPTCP_PM_ATTR_TOKEN,

		.flags		= GENL_UNS_ADMIN_PERM,

	},

	{

		.cmd		= MPTCP_PM_CMD_REMOVE,

		.validate	= GENL_DONT_VALIDATE_STRICT,

		.doit		= mptcp_pm_nl_remove_doit,

		.policy		= mptcp_pm_remove_nl_policy,

		.maxattr	= MPTCP_PM_ATTR_LOC_ID,

		.flags		= GENL_UNS_ADMIN_PERM,

	},

	{

		.cmd		= MPTCP_PM_CMD_SUBFLOW_CREATE,

		.validate	= GENL_DONT_VALIDATE_STRICT,

		.doit		= mptcp_pm_nl_subflow_create_doit,

		.policy		= mptcp_pm_subflow_create_nl_policy,

		.maxattr	= MPTCP_PM_ATTR_ADDR_REMOTE,

		.flags		= GENL_UNS_ADMIN_PERM,

	},

	{

		.cmd		= MPTCP_PM_CMD_SUBFLOW_DESTROY,

		.validate	= GENL_DONT_VALIDATE_STRICT,

		.doit		= mptcp_pm_nl_subflow_destroy_doit,

		.policy		= mptcp_pm_subflow_destroy_nl_policy,

		.maxattr	= MPTCP_PM_ATTR_ADDR_REMOTE,

		.flags		= GENL_UNS_ADMIN_PERM,

	},

};

net/mptcp/mptcp_pm_gen.h

0 → 100644
+58 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */

/* Do not edit directly, auto-generated from: */

/*	Documentation/netlink/specs/mptcp.yaml */

/* YNL-GEN kernel header */



#ifndef _LINUX_MPTCP_PM_GEN_H

#define _LINUX_MPTCP_PM_GEN_H



#include <net/netlink.h>

#include <net/genetlink.h>



#include <uapi/linux/mptcp_pm.h>



/* Common nested types */

extern const struct nla_policy mptcp_pm_address_nl_policy[MPTCP_PM_ADDR_ATTR_IF_IDX + 1];



extern const struct nla_policy mptcp_pm_add_addr_nl_policy[MPTCP_PM_ENDPOINT_ADDR + 1];



extern const struct nla_policy mptcp_pm_del_addr_nl_policy[MPTCP_PM_ENDPOINT_ADDR + 1];



extern const struct nla_policy mptcp_pm_get_addr_nl_policy[MPTCP_PM_ENDPOINT_ADDR + 1];



extern const struct nla_policy mptcp_pm_flush_addrs_nl_policy[MPTCP_PM_ENDPOINT_ADDR + 1];



extern const struct nla_policy mptcp_pm_set_limits_nl_policy[MPTCP_PM_ATTR_SUBFLOWS + 1];



extern const struct nla_policy mptcp_pm_get_limits_nl_policy[MPTCP_PM_ATTR_SUBFLOWS + 1];



extern const struct nla_policy mptcp_pm_set_flags_nl_policy[MPTCP_PM_ATTR_ADDR_REMOTE + 1];



extern const struct nla_policy mptcp_pm_announce_nl_policy[MPTCP_PM_ATTR_TOKEN + 1];



extern const struct nla_policy mptcp_pm_remove_nl_policy[MPTCP_PM_ATTR_LOC_ID + 1];



extern const struct nla_policy mptcp_pm_subflow_create_nl_policy[MPTCP_PM_ATTR_ADDR_REMOTE + 1];



extern const struct nla_policy mptcp_pm_subflow_destroy_nl_policy[MPTCP_PM_ATTR_ADDR_REMOTE + 1];



/* Ops table for mptcp_pm */

extern const struct genl_ops mptcp_pm_nl_ops[11];



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

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

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

int mptcp_pm_nl_get_addr_dumpit(struct sk_buff *skb,

				struct netlink_callback *cb);

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

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

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

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

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

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

int mptcp_pm_nl_subflow_create_doit(struct sk_buff *skb,

				    struct genl_info *info);

int mptcp_pm_nl_subflow_destroy_doit(struct sk_buff *skb,

				     struct genl_info *info);



#endif /* _LINUX_MPTCP_PM_GEN_H */

net/mptcp/pm_netlink.c

+9 −156
Original line number Diff line number Diff line
@@ -48,60 +48,6 @@ struct pm_nl_pernet { 
#define MPTCP_PM_ADDR_MAX	8

#define ADD_ADDR_RETRANS_MAX	3



static

const struct nla_policy mptcp_pm_address_nl_policy[MPTCP_PM_ADDR_ATTR_IF_IDX + 1] = {

	[MPTCP_PM_ADDR_ATTR_FAMILY] = { .type = NLA_U16, },

	[MPTCP_PM_ADDR_ATTR_ID] = { .type = NLA_U8, },

	[MPTCP_PM_ADDR_ATTR_ADDR4] = { .type = NLA_U32, },

	[MPTCP_PM_ADDR_ATTR_ADDR6] = NLA_POLICY_EXACT_LEN(16),

	[MPTCP_PM_ADDR_ATTR_PORT] = { .type = NLA_U16, },

	[MPTCP_PM_ADDR_ATTR_FLAGS] = { .type = NLA_U32, },

	[MPTCP_PM_ADDR_ATTR_IF_IDX] = { .type = NLA_S32, },

};



/* MPTCP_PM_CMD_ADD_ADDR / DEL / GET / FLUSH - do */

static

const struct nla_policy mptcp_pm_endpoint_nl_policy[MPTCP_PM_ENDPOINT_ADDR + 1] = {

	[MPTCP_PM_ENDPOINT_ADDR] = NLA_POLICY_NESTED(mptcp_pm_address_nl_policy),

};



/* MPTCP_PM_CMD_SET_LIMITS - do */

static

const struct nla_policy mptcp_pm_set_limits_nl_policy[MPTCP_PM_ATTR_SUBFLOWS + 1] = {

	[MPTCP_PM_ATTR_RCV_ADD_ADDRS] = { .type = NLA_U32, },

	[MPTCP_PM_ATTR_SUBFLOWS] = { .type = NLA_U32, },

};



/* MPTCP_PM_CMD_SET_FLAGS - do */

static

const struct nla_policy mptcp_pm_set_flags_nl_policy[MPTCP_PM_ATTR_ADDR_REMOTE + 1] = {

	[MPTCP_PM_ATTR_ADDR] = NLA_POLICY_NESTED(mptcp_pm_address_nl_policy),

	[MPTCP_PM_ATTR_TOKEN] = { .type = NLA_U32, },

	[MPTCP_PM_ATTR_ADDR_REMOTE] = NLA_POLICY_NESTED(mptcp_pm_address_nl_policy),

};



/* MPTCP_PM_CMD_ANNOUNCE - do */

static

const struct nla_policy mptcp_pm_announce_nl_policy[MPTCP_PM_ATTR_TOKEN + 1] = {

	[MPTCP_PM_ATTR_ADDR] = NLA_POLICY_NESTED(mptcp_pm_address_nl_policy),

	[MPTCP_PM_ATTR_TOKEN] = { .type = NLA_U32, },

};



/* MPTCP_PM_CMD_REMOVE - do */

static

const struct nla_policy mptcp_pm_remove_nl_policy[MPTCP_PM_ATTR_LOC_ID + 1] = {

	[MPTCP_PM_ATTR_TOKEN] = { .type = NLA_U32, },

	[MPTCP_PM_ATTR_LOC_ID] = { .type = NLA_U8, },

};



/* MPTCP_PM_CMD_SUBFLOW_CREATE / DESTROY - do */

static

const struct nla_policy mptcp_pm_subflow_create_nl_policy[MPTCP_PM_ATTR_ADDR_REMOTE + 1] = {

	[MPTCP_PM_ATTR_ADDR] = NLA_POLICY_NESTED(mptcp_pm_address_nl_policy),

	[MPTCP_PM_ATTR_TOKEN] = { .type = NLA_U32, },

	[MPTCP_PM_ATTR_ADDR_REMOTE] = NLA_POLICY_NESTED(mptcp_pm_address_nl_policy),

};



static struct pm_nl_pernet *pm_nl_get_pernet(const struct net *net)

{

	return net_generic(net, pm_nl_pernet_id);
@@ -1355,7 +1301,7 @@ static bool mptcp_pm_has_addr_attr_id(const struct nlattr *attr, 
	return false;

}



static int mptcp_pm_nl_add_addr_doit(struct sk_buff *skb, struct genl_info *info)

int mptcp_pm_nl_add_addr_doit(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);
@@ -1537,7 +1483,7 @@ static int mptcp_nl_remove_id_zero_address(struct net *net, 
	return 0;

}



static int mptcp_pm_nl_del_addr_doit(struct sk_buff *skb, struct genl_info *info)

int mptcp_pm_nl_del_addr_doit(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);
@@ -1673,7 +1619,7 @@ static void __reset_counters(struct pm_nl_pernet *pernet) 
	pernet->addrs = 0;

}



static int mptcp_pm_nl_flush_addrs_doit(struct sk_buff *skb, struct genl_info *info)

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

{

	struct pm_nl_pernet *pernet = genl_info_pm_nl(info);

	LIST_HEAD(free_list);
@@ -1729,7 +1675,7 @@ static int mptcp_nl_fill_addr(struct sk_buff *skb, 
	return -EMSGSIZE;

}



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

int mptcp_pm_nl_get_addr_doit(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);
@@ -1779,7 +1725,7 @@ static int mptcp_pm_nl_get_addr_doit(struct sk_buff *skb, struct genl_info *info 
	return ret;

}



static int mptcp_pm_nl_get_addr_dumpit(struct sk_buff *msg,

int mptcp_pm_nl_get_addr_dumpit(struct sk_buff *msg,

				struct netlink_callback *cb)

{

	struct net *net = sock_net(msg->sk);
@@ -1837,8 +1783,7 @@ static int parse_limit(struct genl_info *info, int id, unsigned int *limit) 
	return 0;

}



static int

mptcp_pm_nl_set_limits_doit(struct sk_buff *skb, struct genl_info *info)

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

{

	struct pm_nl_pernet *pernet = genl_info_pm_nl(info);

	unsigned int rcv_addrs, subflows;
@@ -1863,8 +1808,7 @@ mptcp_pm_nl_set_limits_doit(struct sk_buff *skb, struct genl_info *info) 
	return ret;

}



static int

mptcp_pm_nl_get_limits_doit(struct sk_buff *skb, struct genl_info *info)

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

{

	struct pm_nl_pernet *pernet = genl_info_pm_nl(info);

	struct sk_buff *msg;
@@ -1973,7 +1917,7 @@ int mptcp_pm_nl_set_flags(struct net *net, struct mptcp_pm_addr_entry *addr, u8 
	return 0;

}



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

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 }, };
@@ -2337,97 +2281,6 @@ void mptcp_event(enum mptcp_event_type type, const struct mptcp_sock *msk, 
	nlmsg_free(skb);

}



static const struct genl_ops mptcp_pm_nl_ops[] = {

	{

		.cmd		= MPTCP_PM_CMD_ADD_ADDR,

		.validate	= GENL_DONT_VALIDATE_STRICT,

		.doit		= mptcp_pm_nl_add_addr_doit,

		.policy		= mptcp_pm_endpoint_nl_policy,

		.maxattr	= MPTCP_PM_ENDPOINT_ADDR,

		.flags		= GENL_UNS_ADMIN_PERM,

	},

	{

		.cmd		= MPTCP_PM_CMD_DEL_ADDR,

		.validate	= GENL_DONT_VALIDATE_STRICT,

		.doit		= mptcp_pm_nl_del_addr_doit,

		.policy		= mptcp_pm_endpoint_nl_policy,

		.maxattr	= MPTCP_PM_ENDPOINT_ADDR,

		.flags		= GENL_UNS_ADMIN_PERM,

	},

	{

		.cmd		= MPTCP_PM_CMD_GET_ADDR,

		.validate	= GENL_DONT_VALIDATE_STRICT,

		.doit		= mptcp_pm_nl_get_addr_doit,

		.dumpit		= mptcp_pm_nl_get_addr_dumpit,

		.policy		= mptcp_pm_endpoint_nl_policy,

		.maxattr	= MPTCP_PM_ENDPOINT_ADDR,

		.flags		= GENL_UNS_ADMIN_PERM,

	},

	{

		.cmd		= MPTCP_PM_CMD_FLUSH_ADDRS,

		.validate	= GENL_DONT_VALIDATE_STRICT,

		.doit		= mptcp_pm_nl_flush_addrs_doit,

		.policy		= mptcp_pm_endpoint_nl_policy,

		.maxattr	= MPTCP_PM_ENDPOINT_ADDR,

		.flags		= GENL_UNS_ADMIN_PERM,

	},

	{

		.cmd		= MPTCP_PM_CMD_SET_LIMITS,

		.validate	= GENL_DONT_VALIDATE_STRICT,

		.doit		= mptcp_pm_nl_set_limits_doit,

		.policy		= mptcp_pm_set_limits_nl_policy,

		.maxattr	= MPTCP_PM_ATTR_SUBFLOWS,

		.flags		= GENL_UNS_ADMIN_PERM,

	},

	{

		.cmd		= MPTCP_PM_CMD_GET_LIMITS,

		.validate	= GENL_DONT_VALIDATE_STRICT,

		.doit		= mptcp_pm_nl_get_limits_doit,

		.policy		= mptcp_pm_set_limits_nl_policy,

		.maxattr	= MPTCP_PM_ATTR_SUBFLOWS,

	},

	{

		.cmd		= MPTCP_PM_CMD_SET_FLAGS,

		.validate	= GENL_DONT_VALIDATE_STRICT,

		.doit		= mptcp_pm_nl_set_flags_doit,

		.policy		= mptcp_pm_set_flags_nl_policy,

		.maxattr	= MPTCP_PM_ATTR_ADDR_REMOTE,

		.flags		= GENL_UNS_ADMIN_PERM,

	},

	{

		.cmd		= MPTCP_PM_CMD_ANNOUNCE,

		.validate	= GENL_DONT_VALIDATE_STRICT,

		.doit		= mptcp_pm_nl_announce_doit,

		.policy		= mptcp_pm_announce_nl_policy,

		.maxattr	= MPTCP_PM_ATTR_TOKEN,

		.flags		= GENL_UNS_ADMIN_PERM,

	},

	{

		.cmd		= MPTCP_PM_CMD_REMOVE,

		.validate	= GENL_DONT_VALIDATE_STRICT,

		.doit		= mptcp_pm_nl_remove_doit,

		.policy		= mptcp_pm_remove_nl_policy,

		.maxattr	= MPTCP_PM_ATTR_LOC_ID,

		.flags		= GENL_UNS_ADMIN_PERM,

	},

	{

		.cmd		= MPTCP_PM_CMD_SUBFLOW_CREATE,

		.validate	= GENL_DONT_VALIDATE_STRICT,

		.doit		= mptcp_pm_nl_subflow_create_doit,

		.policy		= mptcp_pm_subflow_create_nl_policy,

		.maxattr	= MPTCP_PM_ATTR_ADDR_REMOTE,

		.flags		= GENL_UNS_ADMIN_PERM,

	},

	{

		.cmd		= MPTCP_PM_CMD_SUBFLOW_DESTROY,

		.validate	= GENL_DONT_VALIDATE_STRICT,

		.doit		= mptcp_pm_nl_subflow_destroy_doit,

		.policy		= mptcp_pm_subflow_create_nl_policy,

		.maxattr	= MPTCP_PM_ATTR_ADDR_REMOTE,

		.flags		= GENL_UNS_ADMIN_PERM,

	},

};



static struct genl_family mptcp_genl_family __ro_after_init = {

	.name		= MPTCP_PM_NAME,

	.version	= MPTCP_PM_VER,

net/mptcp/protocol.h

+2 −4
Original line number Diff line number Diff line
@@ -13,6 +13,8 @@ 
#include <uapi/linux/mptcp.h>

#include <net/genetlink.h>



#include "mptcp_pm_gen.h"



#define MPTCP_SUPPORTED_VERSION	1



/* MPTCP option bits */
@@ -927,10 +929,6 @@ void mptcp_pm_remove_addrs_and_subflows(struct mptcp_sock *msk, 
					struct list_head *rm_list);



void mptcp_free_local_addr_list(struct mptcp_sock *msk);

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

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

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

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



void mptcp_event(enum mptcp_event_type type, const struct mptcp_sock *msk,

		 const struct sock *ssk, gfp_t gfp);