netfilter: nf_tables: cancel register tracking if .reduce is not defined
Subsystems (2)
Pablo Neira Ayuso
maintainerPATCH v4 1/1 netfilter: nf_tables: cancel register tracking if .reduce is not defined
Cancel all register tracking if the reduce function is not defined. Add missing reduce function to cmp, immediate, counter and compat since these are read-only register.
This patch unbreaks selftests/netfilter/nft_nat_zones.sh.
Fixes 12e4ecfa244b ("netfilter: nf_tables: add register tracking infrastructure")
Suggested-by Florian Westphal <[email protected]>
Signed-off-by Pablo Neira Ayuso <[email protected]>
---
v4: verdict through immediate might also cancel tracking.
net/netfilter/nf_tables_api.c | 2 ++ net/netfilter/nft_cmp.c | 8 ++++++++ net/netfilter/nft_compat.c | 14 ++++++++++++++ net/netfilter/nft_counter.c | 7 +++++++ net/netfilter/nft_immediate.c | 14 ++++++++++++++ 5 files changed, 45 insertions(+)
net/netfilter/nf_tables_api.c +2 -0
@@ -8311,6 +8311,8 @@ static int nf_tables_commit_chain_prepare(struct net *net, struct nft_chain *cha expr->ops->reduce(&track, expr)) { expr = track.cur;continue ; + } else if (expr->ops->reduce == NULL) { +memset (track.regs,0 ,sizeof (track.regs)); }if (WARN_ON_ONCE (data + expr->ops->size > data_boundary))
net/netfilter/nft_cmp.c +8 -0
@@ -187,12 +187,19 @@ static int nft_cmp_offload(struct nft_offload_ctx *ctx,return __nft_cmp_offload (ctx, flow, priv); } +static bool nft_cmp_reduce (struct nft_regs_track *track, +const struct nft_expr *expr) +{ +return false; +} +static const struct nft_expr_ops nft_cmp_ops = { .type = &nft_cmp_type, .size =NFT_EXPR_SIZE (sizeof (struct nft_cmp_expr )), .eval = nft_cmp_eval, .init = nft_cmp_init, .dump = nft_cmp_dump, + .reduce = nft_cmp_reduce, .offload = nft_cmp_offload, };
@@ -269,6 +276,7 @@ const struct nft_expr_ops nft_cmp_fast_ops = { .eval = NULL, /* inlined */ .init = nft_cmp_fast_init, .dump = nft_cmp_fast_dump, + .reduce = nft_cmp_reduce, .offload = nft_cmp_fast_offload, };
net/netfilter/nft_compat.c +14 -0
@@ -731,6 +731,12 @@ static const struct nfnetlink_subsystem nfnl_compat_subsys = {static struct nft_expr_type nft_match_type; +static bool nft_match_reduce (struct nft_regs_track *track, +const struct nft_expr *expr) +{ +return false; +} +static const struct nft_expr_ops *nft_match_select_ops (const struct nft_ctx *ctx,const struct nlattr *const tb[])
@@ -773,6 +779,7 @@ nft_match_select_ops(const struct nft_ctx *ctx, ops->dump = nft_match_dump; ops->validate = nft_match_validate; ops->data = match; + ops->reduce = nft_match_reduce; matchsize =NFT_EXPR_SIZE (XT_ALIGN (match->matchsize));if (matchsize >NFT_MATCH_LARGE_THRESH ) {
@@ -811,6 +818,12 @@ static struct nft_expr_type nft_match_type __read_mostly = {static struct nft_expr_type nft_target_type; +static bool nft_target_reduce (struct nft_regs_track *track, +const struct nft_expr *expr) +{ +return false; +} +static const struct nft_expr_ops *nft_target_select_ops (const struct nft_ctx *ctx,const struct nlattr *const tb[])
@@ -862,6 +875,7 @@ nft_target_select_ops(const struct nft_ctx *ctx, ops->dump = nft_target_dump; ops->validate = nft_target_validate; ops->data = target; + ops->reduce = nft_target_reduce;if (family ==NFPROTO_BRIDGE ) ops->eval = nft_target_eval_bridge;
net/netfilter/nft_counter.c +7 -0
@@ -283,6 +283,12 @@ void nft_counter_init_seqcount(void)seqcount_init (per_cpu_ptr (&nft_counter_seq, cpu)); } +static bool nft_counter_reduce (struct nft_regs_track *track, +const struct nft_expr *expr) +{ +return false; +} +struct nft_expr_type nft_counter_type;static const struct nft_expr_ops nft_counter_ops = { .type = &nft_counter_type,
@@ -293,6 +299,7 @@ static const struct nft_expr_ops nft_counter_ops = { .destroy_clone = nft_counter_destroy, .dump = nft_counter_dump, .clone = nft_counter_clone, + .reduce = nft_counter_reduce, .offload = nft_counter_offload, .offload_stats = nft_counter_offload_stats, };
net/netfilter/nft_immediate.c +14 -0
@@ -223,6 +223,19 @@ static bool nft_immediate_offload_action(const struct nft_expr *expr)return false; } +static bool nft_immediate_reduce (struct nft_regs_track *track, +const struct nft_expr *expr) +{ +const struct nft_immediate_expr *priv =nft_expr_priv (expr); + +if (priv->dreg !=NFT_REG_VERDICT ) { + track->regs[priv->dreg].selector =NULL ; + track->regs[priv->dreg].bitwise =NULL ; + } + +return false; +} +static const struct nft_expr_ops nft_imm_ops = { .type = &nft_imm_type, .size =NFT_EXPR_SIZE (sizeof (struct nft_immediate_expr )),
@@ -233,6 +246,7 @@ static const struct nft_expr_ops nft_imm_ops = { .destroy = nft_immediate_destroy, .dump = nft_immediate_dump, .validate = nft_immediate_validate, + .reduce = nft_immediate_reduce, .offload = nft_immediate_offload, .offload_action = nft_immediate_offload_action, };
Signature · 1 line
2.30.2