552075b562
* Thu Feb 09 2023 Phil Sutter <psutter@redhat.com> [1.0.4-8.el9] - monitor: Sanitize startup race condition (Phil Sutter) [2130721] - evaluate: set eval ctx for add/update statements with integer constants (Phil Sutter) [2094894] - src: allow anon set concatenation with ether and vlan (Phil Sutter) [2094887] - evaluate: search stacked header list for matching payload dep (Phil Sutter) [2094887] - netlink_delinearize: also postprocess OP_AND in set element context (Phil Sutter) [2094887] - tests: add a test case for ether and vlan listing (Phil Sutter) [2094887] - debug: dump the l2 protocol stack (Phil Sutter) [2094887] - proto: track full stack of seen l2 protocols, not just cumulative offset (Phil Sutter) [2094887] - netlink_delinearize: postprocess binary ands in concatenations (Phil Sutter) [2094887] - netlink_delinearize: allow postprocessing on concatenated elements (Phil Sutter) [2094887] - intervals: check for EXPR_F_REMOVE in case of element mismatch (Phil Sutter) [2115627] - intervals: fix crash when trying to remove element in empty set (Phil Sutter) [2115627] - scanner: don't pop active flex scanner scope (Phil Sutter) [2113874] - parser: add missing synproxy scope closure (Phil Sutter) [2113874] - tests/py: Add a test for failing ipsec after counter (Phil Sutter) [2113874] - doc: Document limitations of ipsec expression with xfrm_interface (Phil Sutter) [1806431] Resolves: rhbz#1806431, rhbz#2094887, rhbz#2094894, rhbz#2113874, rhbz#2115627, rhbz#2130721, rhbz#2094890
81 lines
2.1 KiB
Diff
81 lines
2.1 KiB
Diff
From 8099eb08541428efe92c4a1a4cbaf3530fd125e7 Mon Sep 17 00:00:00 2001
|
|
From: Phil Sutter <psutter@redhat.com>
|
|
Date: Thu, 9 Feb 2023 10:25:59 +0100
|
|
Subject: [PATCH] intervals: check for EXPR_F_REMOVE in case of element
|
|
mismatch
|
|
|
|
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2115627
|
|
Upstream Status: nftables commit 6d1ee9267e7e5
|
|
|
|
commit 6d1ee9267e7e5e429a84d7bb8a8644f9eebddb22
|
|
Author: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
Date: Thu Jun 23 18:41:21 2022 +0200
|
|
|
|
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 <pablo@netfilter.org>
|
|
|
|
Signed-off-by: Phil Sutter <psutter@redhat.com>
|
|
---
|
|
src/intervals.c | 4 ++++
|
|
tests/shell/testcases/sets/errors_0 | 20 ++++++++++++++++++--
|
|
2 files changed, 22 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/intervals.c b/src/intervals.c
|
|
index c21b3ee..13009ca 100644
|
|
--- a/src/intervals.c
|
|
+++ b/src/intervals.c
|
|
@@ -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;
|
|
}
|
|
diff --git a/tests/shell/testcases/sets/errors_0 b/tests/shell/testcases/sets/errors_0
|
|
index 2960b69..a676ac7 100755
|
|
--- a/tests/shell/testcases/sets/errors_0
|
|
+++ b/tests/shell/testcases/sets/errors_0
|
|
@@ -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
|
|
--
|
|
2.39.1
|
|
|