5.15-stable patches

added patches:
	selftests-mptcp-pm-check-flush-doesn-t-reset-limits.patch

diff --git a/queue-5.15/selftests-mptcp-pm-check-flush-doesn-t-reset-limits.patch b/queue-5.15/selftests-mptcp-pm-check-flush-doesn-t-reset-limits.patch
new file mode 100644 (file)
index 0000000..95689f8
--- /dev/null
+++ b/queue-5.15/selftests-mptcp-pm-check-flush-doesn-t-reset-limits.patch
@@ -0,0 +1,47 @@
+From 452690be7de2f91cc0de68cb9e95252875b33503 Mon Sep 17 00:00:00 2001
+From: "Matthieu Baerts (NGI0)" <matttbe@kernel.org>
+Date: Fri, 15 Aug 2025 19:28:21 +0200
+Subject: selftests: mptcp: pm: check flush doesn't reset limits
+
+From: Matthieu Baerts (NGI0) <matttbe@kernel.org>
+
+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 <martineau@kernel.org>
+Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
+Link: https://patch.msgid.link/20250815-net-mptcp-misc-fixes-6-17-rc2-v1-3-521fe9957892@kernel.org
+Signed-off-by: Jakub Kicinski <kuba@kernel.org>
+[ 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) <matttbe@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ 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-5.15/series b/queue-5.15/series
index 943ac27de4bd665bb59bfed86892cc02b5b46108..169dd72e422778eca1c964d0371decd87f07558e 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -608,3 +608,4 @@ scsi-mpi3mr-serialize-admin-queue-bar-writes-on-32-bit-systems.patch
 pwm-mediatek-implement-.apply-callback.patch
 pwm-mediatek-handle-hardware-enable-and-clock-enable-separately.patch
 pwm-mediatek-fix-duty-and-period-setting.patch
+selftests-mptcp-pm-check-flush-doesn-t-reset-limits.patch