diff options
| author | Florian Westphal <fw@strlen.de> | 2023-06-19 22:43:03 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2023-11-02 11:56:20 +0100 |
| commit | 8c9862c9ee50ebeb5b280a12edf8c978c55e7ec3 (patch) | |
| tree | c057788dfdd3f5a371f5300730cf98063eaa5f79 | |
| parent | 596514168e22dc7349db277f4571f5009d7f555e (diff) | |
parser: don't assert on scope underflows
commit bb16416ec82599e41043a52887c37157e6f61984 upstream.
close_scope() gets called from the object destructors;
imbalance can cause us to hit assert().
Before:
nft: parser_bison.y:88: close_scope: Assertion `state->scope > 0' failed.
After:
assertion3:4:7-7: Error: too many levels of nesting jump {
assertion3:5:8-8: Error: too many levels of nesting jump
assertion3:5:9-9: Error: syntax error, unexpected newline, expecting '{'
assertion3:7:1-1: Error: syntax error, unexpected end of file
Signed-off-by: Florian Westphal <fw@strlen.de>
| -rw-r--r-- | src/parser_bison.y | 3 | ||||
| -rw-r--r-- | tests/shell/testcases/bogons/nft-f/scope_underflow_assert | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/parser_bison.y b/src/parser_bison.y index eaebaa50..51f51750 100644 --- a/src/parser_bison.y +++ b/src/parser_bison.y @@ -80,12 +80,11 @@ static int open_scope(struct parser_state *state, struct scope *scope) static void close_scope(struct parser_state *state) { - if (state->scope_err) { + if (state->scope_err || state->scope == 0) { state->scope_err = false; return; } - assert(state->scope > 0); state->scope--; } diff --git a/tests/shell/testcases/bogons/nft-f/scope_underflow_assert b/tests/shell/testcases/bogons/nft-f/scope_underflow_assert new file mode 100644 index 00000000..aee1dcbf --- /dev/null +++ b/tests/shell/testcases/bogons/nft-f/scope_underflow_assert @@ -0,0 +1,6 @@ +table t { + chain c { + jump{ + jump { + jump + |