From 81369712074217a484907697cbb2d1e723a8daf6 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 1 Aug 2023 09:42:39 +0200 Subject: [PATCH] 5.10-stable patches added patches: selftests-mptcp-depend-on-syn_cookies.patch --- ...elftests-mptcp-depend-on-syn_cookies.patch | 37 +++++++++++++++++++ queue-5.10/series | 1 + 2 files changed, 38 insertions(+) create mode 100644 queue-5.10/selftests-mptcp-depend-on-syn_cookies.patch diff --git a/queue-5.10/selftests-mptcp-depend-on-syn_cookies.patch b/queue-5.10/selftests-mptcp-depend-on-syn_cookies.patch new file mode 100644 index 00000000000..0da6f2f747f --- /dev/null +++ b/queue-5.10/selftests-mptcp-depend-on-syn_cookies.patch @@ -0,0 +1,37 @@ +From 6c8880fcaa5c45355179b759c1d11737775e31fc Mon Sep 17 00:00:00 2001 +From: Matthieu Baerts +Date: Tue, 4 Jul 2023 22:44:40 +0200 +Subject: selftests: mptcp: depend on SYN_COOKIES + +From: Matthieu Baerts + +commit 6c8880fcaa5c45355179b759c1d11737775e31fc upstream. + +MPTCP selftests are using TCP SYN Cookies for quite a while now, since +v5.9. + +Some CIs don't have this config option enabled and this is causing +issues in the tests: + + # ns1 MPTCP -> ns1 (10.0.1.1:10000 ) MPTCP (duration 167ms) sysctl: cannot stat /proc/sys/net/ipv4/tcp_syncookies: No such file or directory + # [ OK ]./mptcp_connect.sh: line 554: [: -eq: unary operator expected + +There is no impact in the results but the test is not doing what it is +supposed to do. + +Fixes: fed61c4b584c ("selftests: mptcp: make 2nd net namespace use tcp syn cookies unconditionally") +Cc: stable@vger.kernel.org +Signed-off-by: Matthieu Baerts +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman +--- + tools/testing/selftests/net/mptcp/config | 1 + + 1 file changed, 1 insertion(+) + +--- a/tools/testing/selftests/net/mptcp/config ++++ b/tools/testing/selftests/net/mptcp/config +@@ -6,3 +6,4 @@ CONFIG_INET_DIAG=m + CONFIG_INET_MPTCP_DIAG=m + CONFIG_VETH=y + CONFIG_NET_SCH_NETEM=m ++CONFIG_SYN_COOKIES=y diff --git a/queue-5.10/series b/queue-5.10/series index 8a75fdaa052..58dd625fec5 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -107,3 +107,4 @@ drm-ttm-make-ttm_bo_unpin-more-defensive.patch acpi-processor-perflib-use-the-no-limit-frequency-qos.patch acpi-processor-perflib-avoid-updating-frequency-qos-unnecessarily.patch cpufreq-intel_pstate-drop-acpi-_pss-states-table-patching.patch +selftests-mptcp-depend-on-syn_cookies.patch -- 2.47.3