6.1-stable patches

added patches:
	selftests-mptcp-join-fix-dev-in-check_endpoint.patch

diff --git a/queue-6.1/selftests-mptcp-join-fix-dev-in-check_endpoint.patch b/queue-6.1/selftests-mptcp-join-fix-dev-in-check_endpoint.patch
new file mode 100644 (file)
index 0000000..0d77cef
--- /dev/null
+++ b/queue-6.1/selftests-mptcp-join-fix-dev-in-check_endpoint.patch
@@ -0,0 +1,50 @@
+From 40061817d95bce6dd5634a61a65cd5922e6ccc92 Mon Sep 17 00:00:00 2001
+From: Geliang Tang <tanggeliang@kylinos.cn>
+Date: Fri, 29 Mar 2024 13:08:53 +0100
+Subject: selftests: mptcp: join: fix dev in check_endpoint
+
+From: Geliang Tang <tanggeliang@kylinos.cn>
+
+commit 40061817d95bce6dd5634a61a65cd5922e6ccc92 upstream.
+
+There's a bug in pm_nl_check_endpoint(), 'dev' didn't be parsed correctly.
+If calling it in the 2nd test of endpoint_tests() too, it fails with an
+error like this:
+
+ creation  [FAIL] expected '10.0.2.2 id 2 subflow dev dev' \
+                     found '10.0.2.2 id 2 subflow dev ns2eth2'
+
+The reason is '$2' should be set to 'dev', not '$1'. This patch fixes it.
+
+Fixes: 69c6ce7b6eca ("selftests: mptcp: add implicit endpoint test case")
+Cc: stable@vger.kernel.org
+Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
+Reviewed-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
+Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
+Link: https://lore.kernel.org/r/20240329-upstream-net-20240329-fallback-mib-v1-2-324a8981da48@kernel.org
+Signed-off-by: Jakub Kicinski <kuba@kernel.org>
+[ Conflicts in mptcp_join.sh: only the fix has been added, not the
+  verification because this modified subtest is quite different in
+  v6.1: to add this verification, we would need to change a bit the
+  subtest: pm_nl_check_endpoint() takes an extra argument for the
+  title, the next chk_subflow_nr() will no longer need the title, etc.
+  Easier with only the fix without the extra test. ]
+Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+Notes:
+---
+ tools/testing/selftests/net/mptcp/mptcp_join.sh |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
++++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
+@@ -725,7 +725,7 @@ pm_nl_check_endpoint()
+                       [ -n "$_flags" ]; flags="flags $_flags"
+                       shift
+               elif [ $1 = "dev" ]; then
+-                      [ -n "$2" ]; dev="dev $1"
++                      [ -n "$2" ]; dev="dev $2"
+                       shift
+               elif [ $1 = "id" ]; then
+                       _id=$2

diff --git a/queue-6.1/series b/queue-6.1/series
index c1d1532b3c798200d4114d79eab49b852ab2c441..41ecfa4a0f13f10c86300908bd1afa3e95a682a5 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -131,3 +131,4 @@ smb-client-fix-potential-uaf-in-smb2_is_valid_lease_break.patch
 smb-client-fix-potential-uaf-in-is_valid_oplock_break.patch
 smb-client-fix-potential-uaf-in-smb2_is_network_name_deleted.patch
 smb-client-fix-potential-uaf-in-cifs_signal_cifsd_for_reconnect.patch
+selftests-mptcp-join-fix-dev-in-check_endpoint.patch