* [PATCH nf] netfilter: nft_immediate: No increment ctx->level for NFT_GOTO
@ 2020-09-22 0:21 Pablo Neira Ayuso
0 siblings, 0 replies; only message in thread
From: Pablo Neira Ayuso @ 2020-09-22 0:21 UTC (permalink / raw)
To: netfilter-devel; +Cc: steve
From: Steve Hill <steve@opendium.com>
nft_immediate_validate() and nft_lookup_validate_setelem() treat NFT_GOTO and
NFT_JUMP identically, incrementing pctx->level for both. This results in a
-EMLINK ("Too many links") being unexpectedly returned for rulesets that use
lots of gotos.
This fixes this problem by not incrementing pctx->level when following gotos.
[ pablo@netfilter.org: Rebased. Restore pctx->level on error for clarity ]
Fixes: 26b2f552525c ("netfilter: nf_tables: fix jumpstack depth validation")
Signed-off-by: Steve Hill <steve@opendium.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
net/netfilter/nft_immediate.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/net/netfilter/nft_immediate.c b/net/netfilter/nft_immediate.c
index c63eb3b17178..303c19e94a11 100644
--- a/net/netfilter/nft_immediate.c
+++ b/net/netfilter/nft_immediate.c
@@ -158,21 +158,21 @@ static int nft_immediate_validate(const struct nft_ctx *ctx,
return 0;
data = &priv->data;
-
+ err = 0;
switch (data->verdict.code) {
case NFT_JUMP:
- case NFT_GOTO:
pctx->level++;
err = nft_chain_validate(ctx, data->verdict.chain);
- if (err < 0)
- return err;
pctx->level--;
break;
+ case NFT_GOTO:
+ err = nft_chain_validate(ctx, data->verdict.chain);
+ break;
default:
break;
}
- return 0;
+ return err;
}
static int nft_immediate_offload_verdict(struct nft_offload_ctx *ctx,
--
2.20.1
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2020-09-22 0:21 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-22 0:21 [PATCH nf] netfilter: nft_immediate: No increment ctx->level for NFT_GOTO Pablo Neira Ayuso
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).