Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fa498dea authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso Committed by Greg Kroah-Hartman
Browse files

netfilter: nftables: add helper function to set the base sequence number 



[ 802b805162a1b7d8391c40ac8a878e9e63287aff ]

This patch adds a helper function to calculate the base sequence number
field that is stored in the nfnetlink header. Use the helper function
whenever possible.

Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ef35dd70

net/netfilter/nf_tables_api.c

+14 −9
Original line number Diff line number Diff line
@@ -588,6 +588,11 @@ nf_tables_chain_type_lookup(struct net *net, const struct nlattr *nla, 
	return ERR_PTR(-ENOENT);

}



static __be16 nft_base_seq(const struct net *net)

{

	return htons(net->nft.base_seq & 0xffff);

}



static const struct nla_policy nft_table_policy[NFTA_TABLE_MAX + 1] = {

	[NFTA_TABLE_NAME]	= { .type = NLA_STRING,

				    .len = NFT_TABLE_MAXNAMELEN - 1 },
@@ -610,7 +615,7 @@ static int nf_tables_fill_table_info(struct sk_buff *skb, struct net *net, 
	nfmsg = nlmsg_data(nlh);

	nfmsg->nfgen_family	= family;

	nfmsg->version		= NFNETLINK_V0;

	nfmsg->res_id		= htons(net->nft.base_seq & 0xffff);

	nfmsg->res_id		= nft_base_seq(net);



	if (nla_put_string(skb, NFTA_TABLE_NAME, table->name) ||

	    nla_put_be32(skb, NFTA_TABLE_FLAGS, htonl(table->flags)) ||
@@ -1274,7 +1279,7 @@ static int nf_tables_fill_chain_info(struct sk_buff *skb, struct net *net, 
	nfmsg = nlmsg_data(nlh);

	nfmsg->nfgen_family	= family;

	nfmsg->version		= NFNETLINK_V0;

	nfmsg->res_id		= htons(net->nft.base_seq & 0xffff);

	nfmsg->res_id		= nft_base_seq(net);



	if (nla_put_string(skb, NFTA_CHAIN_TABLE, table->name))

		goto nla_put_failure;
@@ -2366,7 +2371,7 @@ static int nf_tables_fill_rule_info(struct sk_buff *skb, struct net *net, 
	nfmsg = nlmsg_data(nlh);

	nfmsg->nfgen_family	= family;

	nfmsg->version		= NFNETLINK_V0;

	nfmsg->res_id		= htons(net->nft.base_seq & 0xffff);

	nfmsg->res_id		= nft_base_seq(net);



	if (nla_put_string(skb, NFTA_RULE_TABLE, table->name))

		goto nla_put_failure;
@@ -3325,7 +3330,7 @@ static int nf_tables_fill_set(struct sk_buff *skb, const struct nft_ctx *ctx, 
	nfmsg = nlmsg_data(nlh);

	nfmsg->nfgen_family	= ctx->family;

	nfmsg->version		= NFNETLINK_V0;

	nfmsg->res_id		= htons(ctx->net->nft.base_seq & 0xffff);

	nfmsg->res_id		= nft_base_seq(ctx->net);



	if (nla_put_string(skb, NFTA_SET_TABLE, ctx->table->name))

		goto nla_put_failure;
@@ -4180,7 +4185,7 @@ static int nf_tables_dump_set(struct sk_buff *skb, struct netlink_callback *cb) 
	nfmsg = nlmsg_data(nlh);

	nfmsg->nfgen_family = table->family;

	nfmsg->version      = NFNETLINK_V0;

	nfmsg->res_id	    = htons(net->nft.base_seq & 0xffff);

	nfmsg->res_id	    = nft_base_seq(net);



	if (nla_put_string(skb, NFTA_SET_ELEM_LIST_TABLE, table->name))

		goto nla_put_failure;
@@ -4252,7 +4257,7 @@ static int nf_tables_fill_setelem_info(struct sk_buff *skb, 
	nfmsg = nlmsg_data(nlh);

	nfmsg->nfgen_family	= ctx->family;

	nfmsg->version		= NFNETLINK_V0;

	nfmsg->res_id		= htons(ctx->net->nft.base_seq & 0xffff);

	nfmsg->res_id		= nft_base_seq(ctx->net);



	if (nla_put_string(skb, NFTA_SET_TABLE, ctx->table->name))

		goto nla_put_failure;
@@ -5383,7 +5388,7 @@ static int nf_tables_fill_obj_info(struct sk_buff *skb, struct net *net, 
	nfmsg = nlmsg_data(nlh);

	nfmsg->nfgen_family	= family;

	nfmsg->version		= NFNETLINK_V0;

	nfmsg->res_id		= htons(net->nft.base_seq & 0xffff);

	nfmsg->res_id		= nft_base_seq(net);



	if (nla_put_string(skb, NFTA_OBJ_TABLE, table->name) ||

	    nla_put_string(skb, NFTA_OBJ_NAME, obj->key.name) ||
@@ -6059,7 +6064,7 @@ static int nf_tables_fill_flowtable_info(struct sk_buff *skb, struct net *net, 
	nfmsg = nlmsg_data(nlh);

	nfmsg->nfgen_family	= family;

	nfmsg->version		= NFNETLINK_V0;

	nfmsg->res_id		= htons(net->nft.base_seq & 0xffff);

	nfmsg->res_id		= nft_base_seq(net);



	if (nla_put_string(skb, NFTA_FLOWTABLE_TABLE, flowtable->table->name) ||

	    nla_put_string(skb, NFTA_FLOWTABLE_NAME, flowtable->name) ||
@@ -6297,7 +6302,7 @@ static int nf_tables_fill_gen_info(struct sk_buff *skb, struct net *net, 
	nfmsg = nlmsg_data(nlh);

	nfmsg->nfgen_family	= AF_UNSPEC;

	nfmsg->version		= NFNETLINK_V0;

	nfmsg->res_id		= htons(net->nft.base_seq & 0xffff);

	nfmsg->res_id		= nft_base_seq(net);



	if (nla_put_be32(skb, NFTA_GEN_ID, htonl(net->nft.base_seq)) ||

	    nla_put_be32(skb, NFTA_GEN_PROC_PID, htonl(task_pid_nr(current))) ||