Skip to content

Commit 44956f9

Browse files
Florian Westphalgregkh
authored andcommitted
netfilter: nf_tables: add missing netlink attrs to policies
commit 467697d upstream. Fixes: 8aeff92 ("netfilter: nf_tables: add stateful object reference to set elements") Fixes: f25ad2e ("netfilter: nf_tables: prepare for expressions associated to set elements") Fixes: 1a94e38 ("netfilter: nf_tables: add NFTA_RULE_ID attribute") Signed-off-by: Florian Westphal <[email protected]> Signed-off-by: Pablo Neira Ayuso <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 082711f commit 44956f9

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

net/netfilter/nf_tables_api.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1978,6 +1978,7 @@ static const struct nla_policy nft_rule_policy[NFTA_RULE_MAX + 1] = {
19781978
[NFTA_RULE_POSITION] = { .type = NLA_U64 },
19791979
[NFTA_RULE_USERDATA] = { .type = NLA_BINARY,
19801980
.len = NFT_USERDATA_MAXLEN },
1981+
[NFTA_RULE_ID] = { .type = NLA_U32 },
19811982
};
19821983

19831984
static int nf_tables_fill_rule_info(struct sk_buff *skb, struct net *net,
@@ -3412,6 +3413,8 @@ static const struct nla_policy nft_set_elem_policy[NFTA_SET_ELEM_MAX + 1] = {
34123413
[NFTA_SET_ELEM_TIMEOUT] = { .type = NLA_U64 },
34133414
[NFTA_SET_ELEM_USERDATA] = { .type = NLA_BINARY,
34143415
.len = NFT_USERDATA_MAXLEN },
3416+
[NFTA_SET_ELEM_EXPR] = { .type = NLA_NESTED },
3417+
[NFTA_SET_ELEM_OBJREF] = { .type = NLA_STRING },
34153418
};
34163419

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

0 commit comments

Comments
 (0)