intervals: fix crash when trying to remove element in empty set
Pablo Neira Ayuso
maintainerPATCH 1/2 intervals: fix crash when trying to remove element in empty set
The set deletion routine expects an initialized set, otherwise it crashes.
Fixes 3e8d934e4f72 ("intervals: support to partial deletion with automerge")
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- src/intervals.c | 6 +++++- tests/shell/testcases/sets/errors_0 | 14 ++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100755 tests/shell/testcases/sets/errors_0
src/intervals.c +5 -1
@@ -475,7 +475,11 @@ int set_delete(struct list_head *msgs, struct cmd *cmd, struct set *set,if (set->automerge)automerge_delete (msgs, set, init, debug_mask); -set_to_range (existing_set->init); +if (existing_set->init) { +set_to_range (existing_set->init); + }else { + existing_set->init =set_expr_alloc (&internal_location, set); + }list_splice_init (&init->expressions, &del_list);
tests/shell/testcases/sets/errors_0 new file +14 -0
@@ -0,0 +1,14 @@ +#!/bin/bash + +set -e + +RULESET="table ip x { + set y { + type ipv4_addr + flags interval + } +} + +delete element ip x y { 2.3.4.5 }" + +$NFT -f - <<< $RULESET || exit 0
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH 2/2 intervals: check for EXPR_F_REMOVE in case of element mismatch
If auto-merge is disable and element to be deleted finds no exact matching, then bail out.
Fixes 3e8d934e4f72 ("intervals: support to partial deletion with automerge")
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- src/intervals.c | 4 ++++ tests/shell/testcases/sets/errors_0 | 20 ++++++++++++++++++-- 2 files changed, 22 insertions(+), 2 deletions(-)
src/intervals.c +4 -0
@@ -421,6 +421,10 @@ static int setelem_delete(struct list_head *msgs, struct set *set,expr_error (msgs, i,"element does not exist" ); err =-1 ; goto err; + }else if (i->flags &EXPR_F_REMOVE ) { +expr_error (msgs, i,"element does not exist" ); + err =-1 ; + goto err; } prev =NULL ; }
tests/shell/testcases/sets/errors_0 +18 -2
@@ -1,7 +1,5 @@ #!/bin/bash -set -e - RULESET="table ip x { set y { type ipv4_addr
@@ -11,4 +9,22 @@ RULESET="table ip x { delete element ip x y { 2.3.4.5 }" +$NFT -f - <<< $RULESET +if [ $? -eq 0 ] +then + exit 1 +fi + +RULESET="table ip x { + set y { + type ipv4_addr + flags interval + } +} + +add element x y { 1.1.1.1/24 } +delete element x y { 1.1.1.1/24 } +add element x y { 1.1.1.1/24 } +delete element x y { 2.2.2.2/24 }" + $NFT -f - <<< $RULESET || exit 0
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerQuoted 1 line · Pablo Neira Ayuso
The set deletion routine expects an initialized set, otherwise it crashes.
This series are now in master.