5.15-stable patches

added patches:
	selftests-mptcp-join-only-check-for-ip6tables-if-needed.patch

diff --git a/queue-5.15/selftests-mptcp-join-only-check-for-ip6tables-if-needed.patch b/queue-5.15/selftests-mptcp-join-only-check-for-ip6tables-if-needed.patch
new file mode 100644 (file)
index 0000000..c84b6d6
--- /dev/null
+++ b/queue-5.15/selftests-mptcp-join-only-check-for-ip6tables-if-needed.patch
@@ -0,0 +1,40 @@
+From 016e7ba47f33064fbef8c4307a2485d2669dfd03 Mon Sep 17 00:00:00 2001
+From: Matthieu Baerts <matthieu.baerts@tessares.net>
+Date: Tue, 25 Jul 2023 11:34:55 -0700
+Subject: selftests: mptcp: join: only check for ip6tables if needed
+
+From: Matthieu Baerts <matthieu.baerts@tessares.net>
+
+commit 016e7ba47f33064fbef8c4307a2485d2669dfd03 upstream.
+
+If 'iptables-legacy' is available, 'ip6tables-legacy' command will be
+used instead of 'ip6tables'. So no need to look if 'ip6tables' is
+available in this case.
+
+Cc: stable@vger.kernel.org
+Fixes: 0c4cd3f86a40 ("selftests: mptcp: join: use 'iptables-legacy' if available")
+Acked-by: Paolo Abeni <pabeni@redhat.com>
+Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net>
+Signed-off-by: Mat Martineau <martineau@kernel.org>
+Link: https://lore.kernel.org/r/20230725-send-net-20230725-v1-1-6f60fe7137a9@kernel.org
+Signed-off-by: Jakub Kicinski <kuba@kernel.org>
+Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ tools/testing/selftests/net/mptcp/mptcp_join.sh |    5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
++++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
+@@ -179,10 +179,7 @@ if iptables-legacy -V &> /dev/null; then
+ elif ! iptables -V &> /dev/null; then
+       echo "SKIP: Could not run all tests without iptables tool"
+       exit $ksft_skip
+-fi
+-
+-ip6tables -V > /dev/null 2>&1
+-if [ $? -ne 0 ];then
++elif ! ip6tables -V &> /dev/null; then
+       echo "SKIP: Could not run all tests without ip6tables tool"
+       exit $ksft_skip
+ fi

diff --git a/queue-5.15/series b/queue-5.15/series
index 9a4f299292ecf203f18b0c07a834edd7580b19e6..2cc8d3790f7862a9ce9450968124ec8446c6c209 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -152,3 +152,4 @@ cpufreq-intel_pstate-drop-acpi-_pss-states-table-patching.patch
 selftests-mptcp-sockopt-use-iptables-legacy-if-available.patch
 io_uring-treat-eagain-for-req_f_nowait-as-final-for-io-wq.patch
 asoc-cs42l51-fix-driver-to-properly-autoload-with-automatic-module-loading.patch
+selftests-mptcp-join-only-check-for-ip6tables-if-needed.patch