netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Phil Sutter <phil@nwl.cc>
To: Pablo Neira Ayuso <pablo@netfilter.org>
Cc: netfilter-devel@vger.kernel.org, Florian Westphal <fw@strlen.de>
Subject: [nft PATCH 1/7] tests: shell: maps/named_ct_objects: Fix for recent kernel
Date: Sat,  9 Mar 2024 12:35:21 +0100	[thread overview]
Message-ID: <20240309113527.8723-2-phil@nwl.cc> (raw)
In-Reply-To: <20240309113527.8723-1-phil@nwl.cc>

Since kernel commit 8059918a1377 ("netfilter: nft_ct: sanitize layer 3
and 4 protocol number in custom expectations"), ct expectations
specifying an l3proto which does not match the table family are
rejected.

Signed-off-by: Phil Sutter <phil@nwl.cc>
---
 tests/shell/testcases/maps/dumps/named_ct_objects.nft | 4 ++--
 tests/shell/testcases/maps/named_ct_objects           | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/tests/shell/testcases/maps/dumps/named_ct_objects.nft b/tests/shell/testcases/maps/dumps/named_ct_objects.nft
index 59f18932b28ad..457a08ebc32ca 100644
--- a/tests/shell/testcases/maps/dumps/named_ct_objects.nft
+++ b/tests/shell/testcases/maps/dumps/named_ct_objects.nft
@@ -4,7 +4,7 @@ table inet t {
 		dport 9876
 		timeout 1m
 		size 12
-		l3proto ip
+		l3proto inet
 	}
 
 	ct expectation exp2 {
@@ -12,7 +12,7 @@ table inet t {
 		dport 9876
 		timeout 3s
 		size 13
-		l3proto ip6
+		l3proto inet
 	}
 
 	ct helper myftp {
diff --git a/tests/shell/testcases/maps/named_ct_objects b/tests/shell/testcases/maps/named_ct_objects
index 61b87c1ab14a9..d0bf95012491c 100755
--- a/tests/shell/testcases/maps/named_ct_objects
+++ b/tests/shell/testcases/maps/named_ct_objects
@@ -9,7 +9,6 @@ table inet t {
 		dport 9876
 		timeout 1m
 		size 12
-		l3proto ip
 	}
 
 	ct expectation exp2 {
@@ -17,7 +16,6 @@ table inet t {
 		dport 9876
 		timeout 3s
 		size 13
-		l3proto ip6
 	}
 
 	ct helper myftp {
-- 
2.43.0


  reply	other threads:[~2024-03-09 11:35 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-03-09 11:35 [nft PATCH 0/7] A bunch of JSON printer/parser fixes Phil Sutter
2024-03-09 11:35 ` Phil Sutter [this message]
2024-03-09 11:39   ` [nft PATCH 1/7] tests: shell: maps/named_ct_objects: Fix for recent kernel Florian Westphal
2024-03-09 11:44     ` Phil Sutter
2024-03-09 11:35 ` [nft PATCH 2/7] tests: shell: packetpath/flowtables: Avoid spurious EPERM Phil Sutter
2024-03-09 11:35 ` [nft PATCH 3/7] json: Order output like nft_cmd_expand() Phil Sutter
2024-03-09 11:35 ` [nft PATCH 4/7] tests: shell: Regenerate all json-nft dumps Phil Sutter
2024-03-09 11:35 ` [nft PATCH 5/7] json: Support maps with concatenated data Phil Sutter
2024-03-09 11:35 ` [nft PATCH 6/7] parser: json: Support for synproxy objects Phil Sutter
2024-03-09 11:35 ` [nft PATCH 7/7] tests: shell: Add missing json-nft dumps Phil Sutter
2024-03-19 17:26 ` [nft PATCH 0/7] A bunch of JSON printer/parser fixes Phil Sutter
2024-04-24 20:06 ` Pablo Neira Ayuso
2024-04-24 20:08   ` Pablo Neira Ayuso
2024-04-24 20:41     ` Phil Sutter

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240309113527.8723-2-phil@nwl.cc \
    --to=phil@nwl.cc \
    --cc=fw@strlen.de \
    --cc=netfilter-devel@vger.kernel.org \
    --cc=pablo@netfilter.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).