Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795061861; b=Ms3j9bsvGdnyMLvBfqqGyDJV9rAmG815/xVAETFkjifPNkq2D5HWsQ47txSI4e1tF5TD 5LdNx+tmK2DJcnLWuEey8BucmB2SE71aJqdPUb4k4b65SUbDA9T0nrTGsi1VJuNfHOvhP smtbWUUbymwzDwMbt1g7kcqd9X1fQzXzozAfmi6TxMDOM+wgnYeh+KOVw3za3AbjbsgYG xVTg28M1uOfCjqLdW2Ahb5N87Tz9fUQdW3EISc5Vj7dN9G8lHP1ZqTFd6kFbQay68f/w0 pmW5mNy5Dz1xbclgU85qAvWxcTgk7mFKJBD1KPSZ2RtE8aIwfWV/kZLiCH0i8RHLrww== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795061861; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=UfrDfZl0gSObvrJC5ahUne6Z7WaSOajvszxNjtmIo4o=; b=ow9EoAc/ByCNb8/naojuSA5JV2LVn2GjkTPodRDdoYiM5omf452IE1k4RjZkrkfNZtPV 9QVi9ydRchD0/fthUvTuDS0mnMOTj0Ng218W5gW/qL7D2Wq91pnIUAMXtPL0XlSY6vdYk ZS33zdZR+012DzleO+4RyndCfikh8o/Lnd2IrxXRAyIEztosubi4EWYS5XlgbL0xDqzxW xarqpxWMHEgk18AJ08VKGL/UtXH/sYI9HtKIHKIxupZy978CKDBxaPYc0l9iDFWz4LaBt 4bIwkRc891l2oE5cDeroqoj1upsH8d8/0HVskFG0EZbUmsc/GUDgDgZDSGOGYOj0LsA== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=aqcKtXmB; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 37564606A32F; Thu, 19 Nov 2026 04:17:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=aqcKtXmB Received: by smtp.kernel.org (Postfix) with ESMTPSA id 84C681F000C5; Thu, 19 Nov 2026 04:17:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795061861; bh=UfrDfZl0gSObvrJC5ahUne6Z7WaSOajvszxNjtmIo4o=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=aqcKtXmBRk8GIrn77Mpy1oBN4IhlxGbrMUAkmIexzZUzP/nguHGl3ADmPF3aIq+Df QvEm5KKlIZLHpTLwkstaaVa5TyxoHS6CqAE8MVPQuF+pmBVkDNQJpdUNyadbS9YLg4 bbT3I5kXcow7JKWCASWitea1a8itqFOsao6wwkq8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Florian Westphal , Fernando Fernandez Mancera , Pablo Neira Ayuso , Sasha Levin Subject: [PATCH 5.10 1704/1848] selftests: netfilter: fix return value in zone subtest Date: Wed, 18 Nov 2026 16:02:22 +0100 Message-ID: <20261118150031.063662036@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118145911.150052362@linuxfoundation.org> References: <20261118145911.150052362@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Florian Westphal [ Upstream commit a20a01ae89813ef493dc416d69f2b2ad17afb54c ] zone subtest prints FAIL, but did not set 'ret=1', so kselftest framework reports success. While at it, also fail when "nft -f" returns an error. Noticed thanks to a (broken) local patch that should have caused this selftest (resp. the kselftest framework) to report a failure. Fixes: 33b8aad21ac1 ("selftests: netfilter: add a vrf+conntrack testcase") Signed-off-by: Florian Westphal Reviewed-by: Fernando Fernandez Mancera Signed-off-by: Pablo Neira Ayuso Signed-off-by: Sasha Levin --- .../selftests/netfilter/conntrack_vrf.sh | 25 ++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/netfilter/conntrack_vrf.sh b/tools/testing/selftests/netfilter/conntrack_vrf.sh index 073e8e62d350b..e099221acbcc7 100755 --- a/tools/testing/selftests/netfilter/conntrack_vrf.sh +++ b/tools/testing/selftests/netfilter/conntrack_vrf.sh @@ -88,7 +88,7 @@ busywait $BUSYWAIT_TIMEOUT listener_ready "$ns1" # as decided by the first iteration of the ruleset. test_ct_zone_in() { -ip netns exec "$ns0" nft -f - < /dev/null # should be in zone 1, not zone 2 @@ -117,6 +123,7 @@ EOF echo "PASS: entry found in conntrack zone 1" else echo "FAIL: entry not found in conntrack zone 1" + ret=1 count=$(ip netns exec "$ns0" conntrack -L -s $IP1 -d $IP0 -p icmp --zone 2 2> /dev/null | wc -l) if [ "$count" -eq 1 ]; then echo "FAIL: entry found in zone 2 instead" @@ -141,7 +148,7 @@ test_masquerade_vrf() ip netns exec "$ns0" conntrack -F 2>/dev/null -ip netns exec "$ns0" nft -f - < /dev/null;then echo "FAIL: connect failure with masquerade + sport rewrite on vrf device" ret=1 @@ -188,7 +201,7 @@ EOF test_masquerade_veth() { ip netns exec "$ns0" conntrack -F 2>/dev/null -ip netns exec "$ns0" nft -f - < /dev/null;then echo "FAIL: connect failure with masquerade + sport rewrite on veth device" ret=1 -- 2.53.0