From: Greg Kroah-Hartman Date: Fri, 3 Oct 2025 12:57:35 +0000 (+0200) Subject: 6.1-stable patches X-Git-Tag: v6.6.110~13 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1cf67af435dd4feae7394d335bb355385da30e31;p=thirdparty%2Fkernel%2Fstable-queue.git 6.1-stable patches added patches: selftests-mptcp-connect-fix-build-regression-caused-by-backport.patch --- diff --git a/queue-6.1/selftests-mptcp-connect-fix-build-regression-caused-by-backport.patch b/queue-6.1/selftests-mptcp-connect-fix-build-regression-caused-by-backport.patch new file mode 100644 index 0000000000..59014940b3 --- /dev/null +++ b/queue-6.1/selftests-mptcp-connect-fix-build-regression-caused-by-backport.patch @@ -0,0 +1,58 @@ +From k@mgml.me Fri Oct 3 14:56:36 2025 +From: Kenta Akagi +Date: Thu, 2 Oct 2025 23:17:59 +0900 +Subject: selftests: mptcp: connect: fix build regression caused by backport +To: gregkh@linuxfoundation.org, sashal@kernel.org +Cc: stable@vger.kernel.org, MPTCP Upstream , Kenta Akagi +Message-ID: <20251002141759.76891-1-k@mgml.me> + +From: Kenta Akagi + +Since v6.1.154, mptcp selftests have failed to build with the following +errors: + +mptcp_connect.c: In function ‘main_loop_s’: +mptcp_connect.c:1040:59: error: ‘winfo’ undeclared (first use in this function) + 1040 | err = copyfd_io(fd, remotesock, 1, true, &winfo); + | ^~~~~ +mptcp_connect.c:1040:59: note: each undeclared identifier is reported only once for each function it appears in +mptcp_connect.c:1040:23: error: too many arguments to function ‘copyfd_io’; expected 4, have 5 + 1040 | err = copyfd_io(fd, remotesock, 1, true, &winfo); + | ^~~~~~~~~ ~~~~~~ +mptcp_connect.c:845:12: note: declared here + 845 | static int copyfd_io(int infd, int peerfd, int outfd, bool close_peerfd) + | ^~~~~~~~~ + +This is caused by commit ff160500c499 ("selftests: mptcp: connect: catch +IO errors on listen side"), a backport of upstream 14e22b43df25, +which attempts to use the undeclared variable 'winfo' and passes too many +arguments to copyfd_io(). Both the winfo variable and the updated +copyfd_io() function were introduced in upstream +commit ca7ae8916043 ("selftests: mptcp: mptfo Initiator/Listener"), +which is not present in v6.1.y. + +The goal of the backport is to stop on errors from copyfd_io. +Therefore, the backport does not depend on the changes in upstream +commit ca7ae8916043 ("selftests: mptcp: mptfo Initiator/Listener"). + +This commit simply removes ', &winfo' to fix a build failure. + +Fixes: ff160500c499 ("selftests: mptcp: connect: catch IO errors on listen side") +Signed-off-by: Kenta Akagi +Reviewed-by: Matthieu Baerts (NGI0) +Signed-off-by: Greg Kroah-Hartman +--- + tools/testing/selftests/net/mptcp/mptcp_connect.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/tools/testing/selftests/net/mptcp/mptcp_connect.c ++++ b/tools/testing/selftests/net/mptcp/mptcp_connect.c +@@ -1037,7 +1037,7 @@ again: + + SOCK_TEST_TCPULP(remotesock, 0); + +- err = copyfd_io(fd, remotesock, 1, true, &winfo); ++ err = copyfd_io(fd, remotesock, 1, true); + } else { + perror("accept"); + return 1; diff --git a/queue-6.1/series b/queue-6.1/series index 6801d93a2d..a6fa8aa5ad 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -1 +1,2 @@ stable-crypto-sha256-fix-crash-at-kexec.patch +selftests-mptcp-connect-fix-build-regression-caused-by-backport.patch