cmd: skip variable set elements when collapsing commands
Pablo Neira Ayuso
maintainerPATCH v2 1/1 cmd: skip variable set elements when collapsing commands
ASAN reports an issue when collapsing commands that represent an element through a variable:
include/list.h:60:13: runtime error: member access within null pointer of type 'struct list_head' AddressSanitizer:DEADLYSIGNAL
=================================================================
==11398==ERROR: AddressSanitizer: SEGV on unknown address 0x000000000000 (pc 0x7ffb77cf09c2 bp 0x7ffc818267c0 sp 0x7ffc818267a0 T0) ==11398==The signal is caused by a WRITE memory access.
==11398==Hint: address points to the zero page.
#0 0x7ffb77cf09c2 in __list_add include/list.h:60
#1 0x7ffb77cf0ad9 in list_add_tail include/list.h:87
#2 0x7ffb77cf0e72 in list_move_tail include/list.h:169
#3 0x7ffb77cf86ad in nft_cmd_collapse src/cmd.c:478
#4 0x7ffb77da9f16 in nft_evaluate src/libnftables.c:531
#5 0x7ffb77dac471 in __nft_run_cmd_from_filename src/libnftables.c:720
#6 0x7ffb77dad703 in nft_run_cmd_from_filename src/libnftables.c:807Skip such commands to address this issue.
This patch also extends tests/shell to cover for this bug.
Fixes 498a5f0c219d ("rule: collapse set element commands")
Signed-off-by Pablo Neira Ayuso <[email protected]>
---
v2: extend tests/shell
src/cmd.c | 3 +++ tests/shell/testcases/sets/collapse_elem_0 | 6 ++++++ tests/shell/testcases/sets/dumps/collapse_elem_0.json-nft | 5 ++++- tests/shell/testcases/sets/dumps/collapse_elem_0.nft | 2 +- 4 files changed, 14 insertions(+), 2 deletions(-)
src/cmd.c +3 -0
@@ -455,6 +455,9 @@ bool nft_cmd_collapse(struct list_head *cmds)continue ; } +if (cmd->expr->etype ==EXPR_VARIABLE ) +continue ; +if (!elems) { elems = cmd;continue ;
tests/shell/testcases/sets/collapse_elem_0 +6 -0
@@ -17,3 +17,9 @@ add element ip a x { 2 } add element ip6 a x { 2 }" $NFT -f - <<< $RULESET + +RULESET="define m = { 3, 4 } +add element ip a x \$m +add element ip a x { 5 }" + +$NFT -f - <<< $RULESET
tests/shell/testcases/sets/dumps/collapse_elem_0.json-nft +4 -1
@@ -23,7 +23,10 @@ "handle": 0, "elem": [ 1, - 2 + 2, + 3, + 4, + 5 ] } },
tests/shell/testcases/sets/dumps/collapse_elem_0.nft +1 -1
@@ -1,7 +1,7 @@ table ip a { set x { type inet_service - elements = { 1, 2 } + elements = { 1, 2, 3, 4, 5 } } } table ip6 a {
Signature · 1 line
2.30.2