From 57e981c0565b2ffdd7031785c4fbc4b796e8faf3 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 1 Aug 2023 11:18:12 +0200 Subject: [PATCH] 5.15-stable patches added patches: selftests-mptcp-join-only-check-for-ip6tables-if-needed.patch --- ...n-only-check-for-ip6tables-if-needed.patch | 40 +++++++++++++++++++ queue-5.15/series | 1 + 2 files changed, 41 insertions(+) create mode 100644 queue-5.15/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 index 00000000000..c84b6d676db --- /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 +Date: Tue, 25 Jul 2023 11:34:55 -0700 +Subject: selftests: mptcp: join: only check for ip6tables if needed + +From: Matthieu Baerts + +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 +Signed-off-by: Matthieu Baerts +Signed-off-by: Mat Martineau +Link: https://lore.kernel.org/r/20230725-send-net-20230725-v1-1-6f60fe7137a9@kernel.org +Signed-off-by: Jakub Kicinski +Signed-off-by: Matthieu Baerts +Signed-off-by: Greg Kroah-Hartman +--- + 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 9a4f299292e..2cc8d3790f7 100644 --- 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 -- 2.47.3