Commit ef4b65e5 authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso
Browse files

netfilter: nfnetlink: add struct nfgenmsg to struct nfnl_info and use it 



Update the nfnl_info structure to add a pointer to the nfnetlink header.
This simplifies the existing codebase since this header is usually
accessed. Update existing clients to use this new field.

Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 1a42624a

include/linux/netfilter/nfnetlink.h

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ struct nfnl_info { 
	struct net		*net;

	struct sock		*sk;

	const struct nlmsghdr	*nlh;

	const struct nfgenmsg	*nfmsg;

	struct netlink_ext_ack	*extack;

};

net/netfilter/nf_conntrack_netlink.c

+9 −14
Original line number Diff line number Diff line
@@ -1528,7 +1528,7 @@ static int ctnetlink_del_conntrack(struct sk_buff *skb, 
				   const struct nfnl_info *info,

				   const struct nlattr * const cda[])

{

	struct nfgenmsg *nfmsg = nlmsg_data(info->nlh);

	u8 family = info->nfmsg->nfgen_family;

	struct nf_conntrack_tuple_hash *h;

	struct nf_conntrack_tuple tuple;

	struct nf_conntrack_zone zone;
@@ -1541,12 +1541,12 @@ static int ctnetlink_del_conntrack(struct sk_buff *skb, 


	if (cda[CTA_TUPLE_ORIG])

		err = ctnetlink_parse_tuple(cda, &tuple, CTA_TUPLE_ORIG,

					    nfmsg->nfgen_family, &zone);

					    family, &zone);

	else if (cda[CTA_TUPLE_REPLY])

		err = ctnetlink_parse_tuple(cda, &tuple, CTA_TUPLE_REPLY,

					    nfmsg->nfgen_family, &zone);

					    family, &zone);

	else {

		u_int8_t u3 = nfmsg->version ? nfmsg->nfgen_family : AF_UNSPEC;

		u_int8_t u3 = info->nfmsg->version ? family : AF_UNSPEC;



		return ctnetlink_flush_conntrack(info->net, cda,

						 NETLINK_CB(skb).portid,
@@ -1586,8 +1586,7 @@ static int ctnetlink_get_conntrack(struct sk_buff *skb, 
				   const struct nfnl_info *info,

				   const struct nlattr * const cda[])

{

	struct nfgenmsg *nfmsg = nlmsg_data(info->nlh);

	u_int8_t u3 = nfmsg->nfgen_family;

	u_int8_t u3 = info->nfmsg->nfgen_family;

	struct nf_conntrack_tuple_hash *h;

	struct nf_conntrack_tuple tuple;

	struct nf_conntrack_zone zone;
@@ -2363,10 +2362,9 @@ static int ctnetlink_new_conntrack(struct sk_buff *skb, 
				   const struct nfnl_info *info,

				   const struct nlattr * const cda[])

{

	struct nfgenmsg *nfmsg = nlmsg_data(info->nlh);

	struct nf_conntrack_tuple otuple, rtuple;

	struct nf_conntrack_tuple_hash *h = NULL;

	u_int8_t u3 = nfmsg->nfgen_family;

	u_int8_t u3 = info->nfmsg->nfgen_family;

	struct nf_conntrack_zone zone;

	struct nf_conn *ct;

	int err;
@@ -3259,8 +3257,7 @@ static int ctnetlink_get_expect(struct sk_buff *skb, 
				const struct nfnl_info *info,

				const struct nlattr * const cda[])

{

	struct nfgenmsg *nfmsg = nlmsg_data(info->nlh);

	u_int8_t u3 = nfmsg->nfgen_family;

	u_int8_t u3 = info->nfmsg->nfgen_family;

	struct nf_conntrack_tuple tuple;

	struct nf_conntrack_expect *exp;

	struct nf_conntrack_zone zone;
@@ -3349,8 +3346,7 @@ static int ctnetlink_del_expect(struct sk_buff *skb, 
				const struct nfnl_info *info,

				const struct nlattr * const cda[])

{

	struct nfgenmsg *nfmsg = nlmsg_data(info->nlh);

	u_int8_t u3 = nfmsg->nfgen_family;

	u_int8_t u3 = info->nfmsg->nfgen_family;

	struct nf_conntrack_expect *exp;

	struct nf_conntrack_tuple tuple;

	struct nf_conntrack_zone zone;
@@ -3601,8 +3597,7 @@ static int ctnetlink_new_expect(struct sk_buff *skb, 
				const struct nfnl_info *info,

				const struct nlattr * const cda[])

{

	struct nfgenmsg *nfmsg = nlmsg_data(info->nlh);

	u_int8_t u3 = nfmsg->nfgen_family;

	u_int8_t u3 = info->nfmsg->nfgen_family;

	struct nf_conntrack_tuple tuple;

	struct nf_conntrack_expect *exp;

	struct nf_conntrack_zone zone;

net/netfilter/nf_tables_api.c

+19 −36
Original line number Diff line number Diff line
@@ -861,10 +861,9 @@ static int nft_netlink_dump_start_rcu(struct sock *nlsk, struct sk_buff *skb, 
static int nf_tables_gettable(struct sk_buff *skb, const struct nfnl_info *info,

			      const struct nlattr * const nla[])

{

	const struct nfgenmsg *nfmsg = nlmsg_data(info->nlh);

	struct netlink_ext_ack *extack = info->extack;

	u8 genmask = nft_genmask_cur(info->net);

	int family = nfmsg->nfgen_family;

	u8 family = info->nfmsg->nfgen_family;

	const struct nft_table *table;

	struct net *net = info->net;

	struct sk_buff *skb2;
@@ -1059,10 +1058,9 @@ static int nf_tables_newtable(struct sk_buff *skb, const struct nfnl_info *info, 
			      const struct nlattr * const nla[])

{

	struct nftables_pernet *nft_net = nft_pernet(info->net);

	const struct nfgenmsg *nfmsg = nlmsg_data(info->nlh);

	struct netlink_ext_ack *extack = info->extack;

	u8 genmask = nft_genmask_next(info->net);

	int family = nfmsg->nfgen_family;

	u8 family = info->nfmsg->nfgen_family;

	struct net *net = info->net;

	const struct nlattr *attr;

	struct nft_table *table;
@@ -1254,10 +1252,9 @@ static int nft_flush(struct nft_ctx *ctx, int family) 
static int nf_tables_deltable(struct sk_buff *skb, const struct nfnl_info *info,

			      const struct nlattr * const nla[])

{

	const struct nfgenmsg *nfmsg = nlmsg_data(info->nlh);

	struct netlink_ext_ack *extack = info->extack;

	u8 genmask = nft_genmask_next(info->net);

	int family = nfmsg->nfgen_family;

	u8 family = info->nfmsg->nfgen_family;

	struct net *net = info->net;

	const struct nlattr *attr;

	struct nft_table *table;
@@ -1627,10 +1624,9 @@ static int nf_tables_dump_chains(struct sk_buff *skb, 
static int nf_tables_getchain(struct sk_buff *skb, const struct nfnl_info *info,

			      const struct nlattr * const nla[])

{

	const struct nfgenmsg *nfmsg = nlmsg_data(info->nlh);

	struct netlink_ext_ack *extack = info->extack;

	u8 genmask = nft_genmask_cur(info->net);

	int family = nfmsg->nfgen_family;

	u8 family = info->nfmsg->nfgen_family;

	const struct nft_chain *chain;

	struct net *net = info->net;

	struct nft_table *table;
@@ -2355,10 +2351,9 @@ static int nf_tables_newchain(struct sk_buff *skb, const struct nfnl_info *info, 
			      const struct nlattr * const nla[])

{

	struct nftables_pernet *nft_net = nft_pernet(info->net);

	const struct nfgenmsg *nfmsg = nlmsg_data(info->nlh);

	struct netlink_ext_ack *extack = info->extack;

	u8 genmask = nft_genmask_next(info->net);

	int family = nfmsg->nfgen_family;

	u8 family = info->nfmsg->nfgen_family;

	struct nft_chain *chain = NULL;

	struct net *net = info->net;

	const struct nlattr *attr;
@@ -2453,10 +2448,9 @@ static int nf_tables_newchain(struct sk_buff *skb, const struct nfnl_info *info, 
static int nf_tables_delchain(struct sk_buff *skb, const struct nfnl_info *info,

			      const struct nlattr * const nla[])

{

	const struct nfgenmsg *nfmsg = nlmsg_data(info->nlh);

	struct netlink_ext_ack *extack = info->extack;

	u8 genmask = nft_genmask_next(info->net);

	int family = nfmsg->nfgen_family;

	u8 family = info->nfmsg->nfgen_family;

	struct net *net = info->net;

	const struct nlattr *attr;

	struct nft_table *table;
@@ -3080,10 +3074,9 @@ static int nf_tables_dump_rules_done(struct netlink_callback *cb) 
static int nf_tables_getrule(struct sk_buff *skb, const struct nfnl_info *info,

			     const struct nlattr * const nla[])

{

	const struct nfgenmsg *nfmsg = nlmsg_data(info->nlh);

	struct netlink_ext_ack *extack = info->extack;

	u8 genmask = nft_genmask_cur(info->net);

	int family = nfmsg->nfgen_family;

	u8 family = info->nfmsg->nfgen_family;

	const struct nft_chain *chain;

	const struct nft_rule *rule;

	struct net *net = info->net;
@@ -3221,13 +3214,12 @@ static int nf_tables_newrule(struct sk_buff *skb, const struct nfnl_info *info, 
			     const struct nlattr * const nla[])

{

	struct nftables_pernet *nft_net = nft_pernet(info->net);

	const struct nfgenmsg *nfmsg = nlmsg_data(info->nlh);

	struct netlink_ext_ack *extack = info->extack;

	unsigned int size, i, n, ulen = 0, usize = 0;

	u8 genmask = nft_genmask_next(info->net);

	struct nft_rule *rule, *old_rule = NULL;

	struct nft_expr_info *expr_info = NULL;

	int family = nfmsg->nfgen_family;

	u8 family = info->nfmsg->nfgen_family;

	struct net *net = info->net;

	struct nft_flow_rule *flow;

	struct nft_userdata *udata;
@@ -3459,15 +3451,15 @@ static struct nft_rule *nft_rule_lookup_byid(const struct net *net, 
static int nf_tables_delrule(struct sk_buff *skb, const struct nfnl_info *info,

			     const struct nlattr * const nla[])

{

	const struct nfgenmsg *nfmsg = nlmsg_data(info->nlh);

	struct netlink_ext_ack *extack = info->extack;

	int family = nfmsg->nfgen_family, err = 0;

	u8 genmask = nft_genmask_next(info->net);

	u8 family = info->nfmsg->nfgen_family;

	struct nft_chain *chain = NULL;

	struct net *net = info->net;

	struct nft_table *table;

	struct nft_rule *rule;

	struct nft_ctx ctx;

	int err = 0;



	table = nft_table_lookup(net, nla[NFTA_RULE_TABLE], family, genmask,

				 NETLINK_CB(skb).portid);
@@ -4050,7 +4042,6 @@ static int nf_tables_dump_sets_done(struct netlink_callback *cb) 
static int nf_tables_getset(struct sk_buff *skb, const struct nfnl_info *info,

			    const struct nlattr * const nla[])

{

	const struct nfgenmsg *nfmsg = nlmsg_data(info->nlh);

	struct netlink_ext_ack *extack = info->extack;

	u8 genmask = nft_genmask_cur(info->net);

	struct net *net = info->net;
@@ -4078,7 +4069,7 @@ static int nf_tables_getset(struct sk_buff *skb, const struct nfnl_info *info, 
	}



	/* Only accept unspec with dump */

	if (nfmsg->nfgen_family == NFPROTO_UNSPEC)

	if (info->nfmsg->nfgen_family == NFPROTO_UNSPEC)

		return -EAFNOSUPPORT;

	if (!nla[NFTA_SET_TABLE])

		return -EINVAL;
@@ -4171,11 +4162,10 @@ static int nf_tables_set_desc_parse(struct nft_set_desc *desc, 
static int nf_tables_newset(struct sk_buff *skb, const struct nfnl_info *info,

			    const struct nlattr * const nla[])

{

	const struct nfgenmsg *nfmsg = nlmsg_data(info->nlh);

	u32 ktype, dtype, flags, policy, gc_int, objtype;

	struct netlink_ext_ack *extack = info->extack;

	u8 genmask = nft_genmask_next(info->net);

	int family = nfmsg->nfgen_family;

	u8 family = info->nfmsg->nfgen_family;

	const struct nft_set_ops *ops;

	struct nft_expr *expr = NULL;

	struct net *net = info->net;
@@ -4475,7 +4465,6 @@ static void nft_set_destroy(const struct nft_ctx *ctx, struct nft_set *set) 
static int nf_tables_delset(struct sk_buff *skb, const struct nfnl_info *info,

			    const struct nlattr * const nla[])

{

	const struct nfgenmsg *nfmsg = nlmsg_data(info->nlh);

	struct netlink_ext_ack *extack = info->extack;

	u8 genmask = nft_genmask_next(info->net);

	struct net *net = info->net;
@@ -4484,7 +4473,7 @@ static int nf_tables_delset(struct sk_buff *skb, const struct nfnl_info *info, 
	struct nft_ctx ctx;

	int err;



	if (nfmsg->nfgen_family == NFPROTO_UNSPEC)

	if (info->nfmsg->nfgen_family == NFPROTO_UNSPEC)

		return -EAFNOSUPPORT;

	if (nla[NFTA_SET_TABLE] == NULL)

		return -EINVAL;
@@ -6527,11 +6516,10 @@ static int nf_tables_updobj(const struct nft_ctx *ctx, 
static int nf_tables_newobj(struct sk_buff *skb, const struct nfnl_info *info,

			    const struct nlattr * const nla[])

{

	const struct nfgenmsg *nfmsg = nlmsg_data(info->nlh);

	struct netlink_ext_ack *extack = info->extack;

	u8 genmask = nft_genmask_next(info->net);

	u8 family = info->nfmsg->nfgen_family;

	const struct nft_object_type *type;

	int family = nfmsg->nfgen_family;

	struct net *net = info->net;

	struct nft_table *table;

	struct nft_object *obj;
@@ -6783,10 +6771,9 @@ static int nf_tables_dump_obj_done(struct netlink_callback *cb) 
static int nf_tables_getobj(struct sk_buff *skb, const struct nfnl_info *info,

			    const struct nlattr * const nla[])

{

	const struct nfgenmsg *nfmsg = nlmsg_data(info->nlh);

	struct netlink_ext_ack *extack = info->extack;

	u8 genmask = nft_genmask_cur(info->net);

	int family = nfmsg->nfgen_family;

	u8 family = info->nfmsg->nfgen_family;

	const struct nft_table *table;

	struct net *net = info->net;

	struct nft_object *obj;
@@ -6873,10 +6860,9 @@ static void nft_obj_destroy(const struct nft_ctx *ctx, struct nft_object *obj) 
static int nf_tables_delobj(struct sk_buff *skb, const struct nfnl_info *info,

			    const struct nlattr * const nla[])

{

	const struct nfgenmsg *nfmsg = nlmsg_data(info->nlh);

	struct netlink_ext_ack *extack = info->extack;

	u8 genmask = nft_genmask_next(info->net);

	int family = nfmsg->nfgen_family;

	u8 family = info->nfmsg->nfgen_family;

	struct net *net = info->net;

	const struct nlattr *attr;

	struct nft_table *table;
@@ -7304,12 +7290,11 @@ static int nf_tables_newflowtable(struct sk_buff *skb, 
				  const struct nfnl_info *info,

				  const struct nlattr * const nla[])

{

	const struct nfgenmsg *nfmsg = nlmsg_data(info->nlh);

	struct netlink_ext_ack *extack = info->extack;

	struct nft_flowtable_hook flowtable_hook;

	u8 genmask = nft_genmask_next(info->net);

	u8 family = info->nfmsg->nfgen_family;

	const struct nf_flowtable_type *type;

	int family = nfmsg->nfgen_family;

	struct nft_flowtable *flowtable;

	struct nft_hook *hook, *next;

	struct net *net = info->net;
@@ -7493,10 +7478,9 @@ static int nf_tables_delflowtable(struct sk_buff *skb, 
				  const struct nfnl_info *info,

				  const struct nlattr * const nla[])

{

	const struct nfgenmsg *nfmsg = nlmsg_data(info->nlh);

	struct netlink_ext_ack *extack = info->extack;

	u8 genmask = nft_genmask_next(info->net);

	int family = nfmsg->nfgen_family;

	u8 family = info->nfmsg->nfgen_family;

	struct nft_flowtable *flowtable;

	struct net *net = info->net;

	const struct nlattr *attr;
@@ -7688,9 +7672,8 @@ static int nf_tables_getflowtable(struct sk_buff *skb, 
				  const struct nfnl_info *info,

				  const struct nlattr * const nla[])

{

	const struct nfgenmsg *nfmsg = nlmsg_data(info->nlh);

	u8 genmask = nft_genmask_cur(info->net);

	int family = nfmsg->nfgen_family;

	u8 family = info->nfmsg->nfgen_family;

	struct nft_flowtable *flowtable;

	const struct nft_table *table;

	struct net *net = info->net;

net/netfilter/nfnetlink.c

+2 −0
Original line number Diff line number Diff line
@@ -256,6 +256,7 @@ static int nfnetlink_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh, 
			.net	= net,

			.sk	= nfnlnet->nfnl,

			.nlh	= nlh,

			.nfmsg	= nlmsg_data(nlh),

			.extack	= extack,

		};
@@ -491,6 +492,7 @@ static void nfnetlink_rcv_batch(struct sk_buff *skb, struct nlmsghdr *nlh, 
				.net	= net,

				.sk	= nfnlnet->nfnl,

				.nlh	= nlh,

				.nfmsg	= nlmsg_data(nlh),

				.extack	= &extack,

			};

net/netfilter/nfnetlink_log.c

+2 −3
Original line number Diff line number Diff line
@@ -871,15 +871,14 @@ static int nfulnl_recv_config(struct sk_buff *skb, const struct nfnl_info *info, 
			      const struct nlattr * const nfula[])

{

	struct nfnl_log_net *log = nfnl_log_pernet(info->net);

	struct nfgenmsg *nfmsg = nlmsg_data(info->nlh);

	u_int16_t group_num = ntohs(nfmsg->res_id);

	u_int16_t group_num = ntohs(info->nfmsg->res_id);

	struct nfulnl_msg_config_cmd *cmd = NULL;

	struct nfulnl_instance *inst;

	u16 flags = 0;

	int ret = 0;



	if (nfula[NFULA_CFG_CMD]) {

		u_int8_t pf = nfmsg->nfgen_family;

		u_int8_t pf = info->nfmsg->nfgen_family;

		cmd = nla_data(nfula[NFULA_CFG_CMD]);



		/* Commands without queue context */