diff mbox series

[nft,v2] cache: incorrect flush flag for table/chain

Message ID 20190731113514.26396-1-pablo@netfilter.org
State Accepted
Delegated to: Pablo Neira
Headers show
Series [nft,v2] cache: incorrect flush flag for table/chain | expand

Commit Message

Pablo Neira Ayuso July 31, 2019, 11:35 a.m. UTC 
From: Laura Garcia Liebana <nevola@gmail.com>

After the new cache system, nft raises a table error flushing a chain in
a transaction.

 # nft "flush chain ip nftlb filter-newfarm ; \
    add rule ip nftlb filter-newfarm update \
    @persist-newfarm {  ip saddr : ct mark } ; \
    flush chain ip nftlb nat-newfarm"
 Error: No such file or directory
 flush chain ip nftlb filter-newfarm ; add rule ip nftlb (...)
                                                   ^^^^^

This patch sets the cache flag properly to save this case.

Fixes: 01e5c6f0ed031 ("src: add cache level flags")
Signed-off-by: Laura Garcia Liebana <nevola@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
v2: original patch v1 is: "src: fix flush chain cache flag"
    do force empty cache when flushing specific table/chain

 src/cache.c                                        |  1 -
 tests/shell/testcases/cache/0005_cache_chain_flush | 16 ++++++++++++++++
 tests/shell/testcases/cache/0006_cache_table_flush | 16 ++++++++++++++++
 3 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100755 tests/shell/testcases/cache/0005_cache_chain_flush
 create mode 100755 tests/shell/testcases/cache/0006_cache_table_flush
diff mbox series

Patch

diff --git a/src/cache.c b/src/cache.c
index 0d38034e853f..cffcbb623ced 100644
--- a/src/cache.c
+++ b/src/cache.c
@@ -75,7 +75,6 @@  static unsigned int evaluate_cache_flush(struct cmd *cmd, unsigned int flags)
 		flags |= NFT_CACHE_FLUSHED;
 		break;
 	default:
-		flags = NFT_CACHE_EMPTY;
 		break;
 	}
 
diff --git a/tests/shell/testcases/cache/0005_cache_chain_flush b/tests/shell/testcases/cache/0005_cache_chain_flush
new file mode 100755
index 000000000000..7dfe5c1cbf20
--- /dev/null
+++ b/tests/shell/testcases/cache/0005_cache_chain_flush
@@ -0,0 +1,16 @@ 
+#!/bin/bash
+
+set -e
+
+RULESET="add table ip x
+add chain x y
+add chain x z
+add map ip x mapping { type ipv4_addr : inet_service; flags dynamic,timeout; }
+add rule x y counter
+add rule x z counter"
+
+$NFT -f - <<< "$RULESET" 2>&1
+
+RULESET="flush chain x y; add rule x y update @mapping { ip saddr : tcp sport }; flush chain x z"
+
+$NFT "$RULESET" 2>&1
diff --git a/tests/shell/testcases/cache/0006_cache_table_flush b/tests/shell/testcases/cache/0006_cache_table_flush
new file mode 100755
index 000000000000..fa4da97a7da8
--- /dev/null
+++ b/tests/shell/testcases/cache/0006_cache_table_flush
@@ -0,0 +1,16 @@ 
+#!/bin/bash
+
+set -e
+
+RULESET="add table ip x
+add chain x y
+add chain x z
+add map ip x mapping { type ipv4_addr : inet_service; flags dynamic,timeout; }
+add rule x y counter
+add rule x z counter"
+
+$NFT -f - <<< "$RULESET" 2>&1
+
+RULESET="flush table x; add rule x y update @mapping { ip saddr : tcp sport }; flush chain x z"
+
+$NFT "$RULESET" 2>&1