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

Commit 467697d2 authored by Florian Westphal's avatar Florian Westphal Committed by Pablo Neira Ayuso
Browse files

netfilter: nf_tables: add missing netlink attrs to policies 



Fixes: 8aeff920 ("netfilter: nf_tables: add stateful object reference to set elements")
Fixes: f25ad2e9 ("netfilter: nf_tables: prepare for expressions associated to set elements")
Fixes: 1a94e38d ("netfilter: nf_tables: add NFTA_RULE_ID attribute")
Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent ae6153b5

net/netfilter/nf_tables_api.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -1973,6 +1973,7 @@ static const struct nla_policy nft_rule_policy[NFTA_RULE_MAX + 1] = { 
	[NFTA_RULE_POSITION]	= { .type = NLA_U64 },

	[NFTA_RULE_POSITION]	= { .type = NLA_U64 },

	[NFTA_RULE_USERDATA]	= { .type = NLA_BINARY,

	[NFTA_RULE_USERDATA]	= { .type = NLA_BINARY,

				    .len = NFT_USERDATA_MAXLEN },

				    .len = NFT_USERDATA_MAXLEN },

	[NFTA_RULE_ID]		= { .type = NLA_U32 },

};

};





static int nf_tables_fill_rule_info(struct sk_buff *skb, struct net *net,

static int nf_tables_fill_rule_info(struct sk_buff *skb, struct net *net,
@@ -3380,6 +3381,8 @@ static const struct nla_policy nft_set_elem_policy[NFTA_SET_ELEM_MAX + 1] = { 
	[NFTA_SET_ELEM_TIMEOUT]		= { .type = NLA_U64 },

	[NFTA_SET_ELEM_TIMEOUT]		= { .type = NLA_U64 },

	[NFTA_SET_ELEM_USERDATA]	= { .type = NLA_BINARY,

	[NFTA_SET_ELEM_USERDATA]	= { .type = NLA_BINARY,

					    .len = NFT_USERDATA_MAXLEN },

					    .len = NFT_USERDATA_MAXLEN },

	[NFTA_SET_ELEM_EXPR]		= { .type = NLA_NESTED },

	[NFTA_SET_ELEM_OBJREF]		= { .type = NLA_STRING },

};

};





static const struct nla_policy nft_set_elem_list_policy[NFTA_SET_ELEM_LIST_MAX + 1] = {

static const struct nla_policy nft_set_elem_list_policy[NFTA_SET_ELEM_LIST_MAX + 1] = {