Skip to contentSkip to conversation

monitor: fix double cache update with --echo

PATCH New Pablo Neira Ayuso 1 participant 2 messages Jul 1, 2019 netfilter

lore
Share & tools
lore

Pablo Neira Ayuso

author maintainer
#0 lore raw

PATCH 1/2 monitor: fix double cache update with --echo

The evaluation step already updates the cache for each command in this batch. There is no need to update the cache again from the echo path, otherwise the cache is populated twice with the same object.

Fixes b99c4d072d99 ("Implement --echo option")

---
This fixes a crash when combining -f and -e, the follow up patch introduces a test for such combination.

 src/monitor.c | 1 -
 1 file changed, 1 deletion(-)
src/monitor.c +0 -1
index a68d960bfd4e..5b25c9d4854e 100644
@@ -900,7 +900,6 @@ int netlink_echo_callback(const struct nlmsghdr *nlh, void *data)
 		.ctx = ctx,
 		.loc = &netlink_location,
 		.monitor_flags = 0xffffffff,
-		.cache_needed = true,
 	};
 
 	if (!nft_output_echo(&echo_monh.ctx->nft->output))
Signature · 1 line
2.11.0
author maintainer
#1 lore raw

PATCH 2/2 tests: shell: restore element expiration

This patch adds a test for 24f33c710e8c ("src: enable set expiration date for set elements").

This is also implicitly testing for a cache corruption bug that is fixed by 9b032cd6477b ("monitor: fix double cache update with --echo").

---
 tests/shell/testcases/sets/0036add_set_element_expiration_0 | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100755 tests/shell/testcases/sets/0036add_set_element_expiration_0
tests/shell/testcases/sets/0036add_set_element_expiration_0 new file +13 -0
new file mode 100755
index 000000000000..b9b44b0d1c98
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+NFT=nft
+
+set -e
+
+RULESET="add table ip x
+add set ip x y { type ipv4_addr; flags dynamic,timeout; } 
+add element ip x y { 1.1.1.1 timeout 30s expires 15s }"
+
+test_output=$($NFT -e -f - <<< "$RULESET" 2>&1)
+
+diff_output=$(diff -u <(echo "$test_output") <(echo "$RULESET"))
Signature · 1 line
2.11.0