From: Greg Kroah-Hartman Date: Sun, 24 Aug 2025 07:11:55 +0000 (+0200) Subject: 6.1-stable patches X-Git-Tag: v5.4.297~42 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=23fcb00a69e7f44d20b04bcffa7e6d64e21b1878;p=thirdparty%2Fkernel%2Fstable-queue.git 6.1-stable patches added patches: selftests-mptcp-pm-check-flush-doesn-t-reset-limits.patch --- diff --git a/queue-6.1/mptcp-remove-duplicate-sk_reset_timer-call.patch b/queue-6.1/mptcp-remove-duplicate-sk_reset_timer-call.patch deleted file mode 100644 index ea21612f5d..0000000000 --- a/queue-6.1/mptcp-remove-duplicate-sk_reset_timer-call.patch +++ /dev/null @@ -1,60 +0,0 @@ -From stable+bounces-172607-greg=kroah.com@vger.kernel.org Sat Aug 23 16:34:14 2025 -From: Sasha Levin -Date: Sat, 23 Aug 2025 10:34:06 -0400 -Subject: mptcp: remove duplicate sk_reset_timer call -To: stable@vger.kernel.org -Cc: Geliang Tang , Geliang Tang , "Matthieu Baerts (NGI0)" , Jakub Kicinski , Sasha Levin -Message-ID: <20250823143406.2247894-1-sashal@kernel.org> - -From: Geliang Tang - -[ Upstream commit 5d13349472ac8abcbcb94407969aa0fdc2e1f1be ] - -sk_reset_timer() was called twice in mptcp_pm_alloc_anno_list. - -Simplify the code by using a 'goto' statement to eliminate the -duplication. - -Note that this is not a fix, but it will help backporting the following -patch. The same "Fixes" tag has been added for this reason. - -Fixes: 93f323b9cccc ("mptcp: add a new sysctl add_addr_timeout") -Cc: stable@vger.kernel.org -Signed-off-by: Geliang Tang -Reviewed-by: Matthieu Baerts (NGI0) -Signed-off-by: Matthieu Baerts (NGI0) -Link: https://patch.msgid.link/20250815-net-mptcp-misc-fixes-6-17-rc2-v1-4-521fe9957892@kernel.org -Signed-off-by: Jakub Kicinski -[ adjusted function location from pm.c to pm_netlink.c ] -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - net/mptcp/pm_netlink.c | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c -index 3391d4df2dbb..1f22c434d122 100644 ---- a/net/mptcp/pm_netlink.c -+++ b/net/mptcp/pm_netlink.c -@@ -383,9 +383,7 @@ bool mptcp_pm_alloc_anno_list(struct mptcp_sock *msk, - if (WARN_ON_ONCE(mptcp_pm_is_kernel(msk))) - return false; - -- sk_reset_timer(sk, &add_entry->add_timer, -- jiffies + mptcp_get_add_addr_timeout(net)); -- return true; -+ goto reset_timer; - } - - add_entry = kmalloc(sizeof(*add_entry), GFP_ATOMIC); -@@ -399,6 +397,7 @@ bool mptcp_pm_alloc_anno_list(struct mptcp_sock *msk, - add_entry->retrans_times = 0; - - timer_setup(&add_entry->add_timer, mptcp_pm_add_timer, 0); -+reset_timer: - sk_reset_timer(sk, &add_entry->add_timer, - jiffies + mptcp_get_add_addr_timeout(net)); - --- -2.50.1 - diff --git a/queue-6.1/selftests-mptcp-pm-check-flush-doesn-t-reset-limits.patch b/queue-6.1/selftests-mptcp-pm-check-flush-doesn-t-reset-limits.patch new file mode 100644 index 0000000000..e4eae8aba7 --- /dev/null +++ b/queue-6.1/selftests-mptcp-pm-check-flush-doesn-t-reset-limits.patch @@ -0,0 +1,50 @@ +From stable+bounces-172418-greg=kroah.com@vger.kernel.org Fri Aug 22 16:17:38 2025 +From: "Matthieu Baerts (NGI0)" +Date: Fri, 22 Aug 2025 16:11:28 +0200 +Subject: selftests: mptcp: pm: check flush doesn't reset limits +To: mptcp@lists.linux.dev, stable@vger.kernel.org, gregkh@linuxfoundation.org +Cc: "Matthieu Baerts (NGI0)" , sashal@kernel.org, Mat Martineau , Jakub Kicinski +Message-ID: <20250822141124.49727-8-matttbe@kernel.org> + +From: "Matthieu Baerts (NGI0)" + +commit 452690be7de2f91cc0de68cb9e95252875b33503 upstream. + +This modification is linked to the parent commit where the received +ADD_ADDR limit was accidentally reset when the endpoints were flushed. + +To validate that, the test is now flushing endpoints after having set +new limits, and before checking them. + +The 'Fixes' tag here below is the same as the one from the previous +commit: this patch here is not fixing anything wrong in the selftests, +but it validates the previous fix for an issue introduced by this commit +ID. + +Fixes: 01cacb00b35c ("mptcp: add netlink-based PM") +Cc: stable@vger.kernel.org +Reviewed-by: Mat Martineau +Signed-off-by: Matthieu Baerts (NGI0) +Link: https://patch.msgid.link/20250815-net-mptcp-misc-fixes-6-17-rc2-v1-3-521fe9957892@kernel.org +Signed-off-by: Jakub Kicinski +[ Conflicts in pm_netlink.sh, because some refactoring have been done + later on: commit 3188309c8ceb ("selftests: mptcp: netlink: + add 'limits' helpers") and commit c99d57d0007a ("selftests: mptcp: use + pm_nl endpoint ops") are not in this version. The same operation can + still be done at the same place, without using the new helper. ] +Signed-off-by: Matthieu Baerts (NGI0) +Signed-off-by: Greg Kroah-Hartman +--- + tools/testing/selftests/net/mptcp/pm_netlink.sh | 1 + + 1 file changed, 1 insertion(+) + +--- a/tools/testing/selftests/net/mptcp/pm_netlink.sh ++++ b/tools/testing/selftests/net/mptcp/pm_netlink.sh +@@ -131,6 +131,7 @@ ip netns exec $ns1 ./pm_nl_ctl limits 1 + check "ip netns exec $ns1 ./pm_nl_ctl limits" "$default_limits" "subflows above hard limit" + + ip netns exec $ns1 ./pm_nl_ctl limits 8 8 ++ip netns exec $ns1 ./pm_nl_ctl flush + check "ip netns exec $ns1 ./pm_nl_ctl limits" "accept 8 + subflows 8" "set limits" + diff --git a/queue-6.1/series b/queue-6.1/series index a43dee84cd..e11577c831 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -439,4 +439,4 @@ mmc-sdhci-pci-gli-add-a-new-function-to-simplify-the-code.patch mmc-sdhci-pci-gli-gl9763e-mask-the-replay-timer-timeout-of-aer.patch mm-memory-failure-fix-infinite-uce-for-vm_pfnmap-pfn.patch drm-amd-display-don-t-overclock-dce-6-by-15.patch -mptcp-remove-duplicate-sk_reset_timer-call.patch +selftests-mptcp-pm-check-flush-doesn-t-reset-limits.patch