netdev - [PATCH net-next] selftests: netfilter: fix packetdrill conntrack testcase

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20240514144415.11433-1-fw@strlen.de>
Date: Tue, 14 May 2024 16:44:09 +0200
From: Florian Westphal <fw@...len.de>
To: <netdev@...r.kernel.org>
Cc: Jakub Kicinski <kuba@...nel.org>,
	Pablo Neira Ayuso <pablo@...filter.org>,
	<netfilter-devel@...r.kernel.org>,
	Florian Westphal <fw@...len.de>
Subject: [PATCH net-next] selftests: netfilter: fix packetdrill conntrack testcase

Some versions of conntrack(8) default to ipv4-only, so this needs to request
ipv6 explicitly, like all other spots already do.

Fixes: a8a388c2aae4 ("selftests: netfilter: add packetdrill based conntrack tests")
Reported-by: Jakub Kicinski <kuba@...nel.org>
Closes: https://lore.kernel.org/netdev/20240513114649.6d764307@kernel.org/
Signed-off-by: Florian Westphal <fw@...len.de>
---
 Can't target net because ATM Fixes-commit is only in net-next.

 .../net/netfilter/packetdrill/conntrack_synack_reuse.pkt        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/testing/selftests/net/netfilter/packetdrill/conntrack_synack_reuse.pkt b/tools/testing/selftests/net/netfilter/packetdrill/conntrack_synack_reuse.pkt
index 21e1bb6395e4..842242f8ccf7 100644
--- a/tools/testing/selftests/net/netfilter/packetdrill/conntrack_synack_reuse.pkt
+++ b/tools/testing/selftests/net/netfilter/packetdrill/conntrack_synack_reuse.pkt
@@ -30,5 +30,5 @@
 
 1.5 < S 2000:2000(0) win 32792 <mss 1000,nop,wscale 0, TS val 233 ecr 0,nop,nop>
 
-+0 `conntrack -L -p tcp --dport 8080 2>/dev/null | grep -q SYN_RECV`
++0 `conntrack -f $NFCT_IP_VERSION -L -p tcp --dport 8080 2>/dev/null | grep -q SYN_RECV`
 +0 `iptables -v -S INPUT | grep INVALID | grep -q -- "-c 0 0"`
-- 
2.43.2