6.1-stable patches

added patches:
	regulator-core-fix-locking-in-regulator_resolve_supply-error-path.patch

diff --git a/queue-6.1/regulator-core-fix-locking-in-regulator_resolve_supply-error-path.patch b/queue-6.1/regulator-core-fix-locking-in-regulator_resolve_supply-error-path.patch
new file mode 100644 (file)
index 0000000..1e0074b
--- /dev/null
+++ b/queue-6.1/regulator-core-fix-locking-in-regulator_resolve_supply-error-path.patch
@@ -0,0 +1,66 @@
+From 497330b203d2c59c5ff3fa4c34d14494d7203bc3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@linaro.org>
+Date: Fri, 9 Jan 2026 08:38:38 +0000
+Subject: regulator: core: fix locking in regulator_resolve_supply() error path
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: André Draszik <andre.draszik@linaro.org>
+
+commit 497330b203d2c59c5ff3fa4c34d14494d7203bc3 upstream.
+
+If late enabling of a supply regulator fails in
+regulator_resolve_supply(), the code currently triggers a lockdep
+warning:
+
+    WARNING: drivers/regulator/core.c:2649 at _regulator_put+0x80/0xa0, CPU#6: kworker/u32:4/596
+    ...
+    Call trace:
+     _regulator_put+0x80/0xa0 (P)
+     regulator_resolve_supply+0x7cc/0xbe0
+     regulator_register_resolve_supply+0x28/0xb8
+
+as the regulator_list_mutex must be held when calling _regulator_put().
+
+To solve this, simply switch to using regulator_put().
+
+While at it, we should also make sure that no concurrent access happens
+to our rdev while we clear out the supply pointer. Add appropriate
+locking to ensure that.
+
+While the code in question will be removed altogether in a follow-up
+commit, I believe it is still beneficial to have this corrected before
+removal for future reference.
+
+Fixes: 36a1f1b6ddc6 ("regulator: core: Fix memory leak in regulator_resolve_supply()")
+Fixes: 8e5356a73604 ("regulator: core: Clear the supply pointer if enabling fails")
+Signed-off-by: André Draszik <andre.draszik@linaro.org>
+Link: https://patch.msgid.link/20260109-regulators-defer-v2-2-1a25dc968e60@linaro.org
+Signed-off-by: Mark Brown <broonie@kernel.org>
+Signed-off-by: Nazar Kalashnikov <nazarkalashnikov0@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/regulator/core.c |   10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+--- a/drivers/regulator/core.c
++++ b/drivers/regulator/core.c
+@@ -2183,8 +2183,16 @@ static int regulator_resolve_supply(stru
+       if (rdev->use_count) {
+               ret = regulator_enable(rdev->supply);
+               if (ret < 0) {
+-                      _regulator_put(rdev->supply);
++                      struct regulator *supply;
++
++                      regulator_lock_two(rdev, rdev->supply->rdev, &ww_ctx);
++
++                      supply = rdev->supply;
+                       rdev->supply = NULL;
++
++                      regulator_unlock_two(rdev, supply->rdev, &ww_ctx);
++
++                      regulator_put(supply);
+                       goto out;
+               }
+       }

diff --git a/queue-6.1/series b/queue-6.1/series
index 7df17a46828cb54979958dec325628fb69bf8b69..d84e75f0e86fd1a51d1597d094d73ed0a2ac7597 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -34,3 +34,4 @@ net-qualcomm-rmnet-fix-endpoint-use-after-free-in-rmnet_dellink.patch
 agp-amd64-fix-broken-error-propagation-in-agp_amd64_probe.patch
 af_unix-reject-siocatmark-on-non-stream-sockets.patch
 ring-buffer-remove-ring_buffer_read_prepare_sync.patch
+regulator-core-fix-locking-in-regulator_resolve_supply-error-path.patch