* [PATCH v3 0/2] mfd: twl-core: Fix dangling twl_priv on teardown and probe failure
@ 2026-11-19 19:49 Lee Jones
2026-11-19 19:49 ` [PATCH v3 1/2] mfd: twl-core: Clear twl_priv pointer " Lee Jones
2026-11-19 19:49 ` [PATCH v3 2/2] mfd: twl-core: Reset twl_priv using devm_add_action_or_reset() Lee Jones
0 siblings, 2 replies; 3+ messages in thread
From: Lee Jones @ 2026-11-19 19:49 UTC (permalink / raw)
To: lee
Cc: linux-kernel, Aaro Koskinen, Andreas Kemnade, Kai Svahn,
Kevin Hilman, linux-omap, mfd, Peter Ujfalusi, Roger Quadros,
Samuel Ortiz, syed khasim, Tony Lindgren
These issues were reported by Sashiko.
Patch 1 is the minimal, Stable-suitable fix from v2 (13/27), which was
skipped when the rest of that series was applied due to a collision with
"mfd: twl-core: Unregister the auxiliary platform device on unbind".
Patch 2 is the follow-up suggested by Andreas, converting the manual
twl_priv reset to a devres action.
v2 => v3:
- Rebased patch 1 onto for-mfd-next
- Sent the previously standalone devres follow-up as patch 2
v2 (patch 1): https://lore.kernel.org/all/20261027093306.2812695-14-lee@kernel.org/
v1 (patch 2): https://lore.kernel.org/all/20261105110332.1874728-1-lee@kernel.org/
Cc: Aaro Koskinen <aaro.koskinen@iki.fi>
Cc: Andreas Kemnade <andreas@kemnade.info>
Cc: Kai Svahn <kai.svahn@nokia.com>
Cc: Kevin Hilman <khilman@baylibre.com>
Cc: linux-omap@vger.kernel.org
Cc: mfd@lists.linux.dev
Cc: Peter Ujfalusi <peter.ujfalusi@ti.com>
Cc: Roger Quadros <rogerq@kernel.org>
Cc: Samuel Ortiz <sameo@linux.intel.com>
Cc: syed khasim <x0khasim@ti.com>
Cc: Tony Lindgren <tony@atomide.com>
Lee Jones (2):
mfd: twl-core: Clear twl_priv pointer on teardown and probe failure
mfd: twl-core: Reset twl_priv using devm_add_action_or_reset()
drivers/mfd/twl-core.c | 20 +++++++++++++++++---
1 file changed, 17 insertions(+), 3 deletions(-)
--
2.56.1.750.gf70dc682cf-goog
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH v3 1/2] mfd: twl-core: Clear twl_priv pointer on teardown and probe failure
2026-11-19 19:49 [PATCH v3 0/2] mfd: twl-core: Fix dangling twl_priv on teardown and probe failure Lee Jones
@ 2026-11-19 19:49 ` Lee Jones
2026-11-19 19:49 ` [PATCH v3 2/2] mfd: twl-core: Reset twl_priv using devm_add_action_or_reset() Lee Jones
1 sibling, 0 replies; 3+ messages in thread
From: Lee Jones @ 2026-11-19 19:49 UTC (permalink / raw)
To: lee, Aaro Koskinen, Andreas Kemnade, Kevin Hilman, Roger Quadros,
Tony Lindgren, Kai Svahn, syed khasim, Samuel Ortiz,
Peter Ujfalusi, linux-omap, mfd, linux-kernel
Cc: stable
twl_probe() allocates the file-scope twl_priv state with devm_kzalloc()
and checks for a non-NULL twl_priv at entry to reject multiple device
instances. However, twl_remove() and the early error paths in
twl_probe() never reset twl_priv to NULL, a failure when adding MFD
child devices bypasses twl_remove() by jumping to out instead of fail,
and twl_remove() tears down the IRQ domain and dummy I2C clients before
child devices are unregistered. After devres frees the underlying
memory on probe failure or unbind, twl_priv remains a dangling pointer,
causing subsequent exported API calls to dereference freed memory and
blocking future probe attempts with -EBUSY.
Unregister DT-populated and MFD child devices at the start of
twl_remove(), ensure mfd_add_devices() failures unwind via fail, and
reset twl_priv to NULL in twl_remove() and on probe error exit.
Fixes: 80a97ccd33be ("mfd: twl-core: Collect global variables behind one private structure (global)")
Closes: https://sashiko.dev/#/bug/linux-73e82f84-94de-4d08-82a4-f22d42a1dedf
Cc: stable@vger.kernel.org
Signed-off-by: Lee Jones <lee@kernel.org>
---
v2 => v3: Rebased onto for-mfd-next (the free: label is now out:)
drivers/mfd/twl-core.c | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c
index 55a7f579595c..7784e000b995 100644
--- a/drivers/mfd/twl-core.c
+++ b/drivers/mfd/twl-core.c
@@ -691,6 +691,11 @@ static void twl_remove(struct i2c_client *client)
{
unsigned i, num_slaves;
+ of_platform_depopulate(&client->dev);
+
+ if (twl_class_is_6030())
+ mfd_remove_devices(&client->dev);
+
if (pm_power_off == twl6030_power_off)
pm_power_off = NULL;
@@ -708,6 +713,7 @@ static void twl_remove(struct i2c_client *client)
twl->client = NULL;
}
twl_priv->ready = false;
+ twl_priv = NULL;
}
@@ -883,10 +889,10 @@ twl_probe(struct i2c_client *client)
num_cells = ARRAY_SIZE(twl6030_cells);
}
- status = devm_mfd_add_devices(&client->dev, PLATFORM_DEVID_NONE,
- cells, num_cells, NULL, 0, NULL);
+ status = mfd_add_devices(&client->dev, PLATFORM_DEVID_NONE,
+ cells, num_cells, NULL, 0, NULL);
if (status < 0)
- goto out;
+ goto fail;
if (of_device_is_system_power_controller(node)) {
if (!pm_power_off)
@@ -903,6 +909,9 @@ twl_probe(struct i2c_client *client)
if (status < 0)
twl_remove(client);
out:
+ if (status < 0)
+ twl_priv = NULL;
+
return status;
}
--
2.56.1.750.gf70dc682cf-goog
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH v3 2/2] mfd: twl-core: Reset twl_priv using devm_add_action_or_reset()
2026-11-19 19:49 [PATCH v3 0/2] mfd: twl-core: Fix dangling twl_priv on teardown and probe failure Lee Jones
2026-11-19 19:49 ` [PATCH v3 1/2] mfd: twl-core: Clear twl_priv pointer " Lee Jones
@ 2026-11-19 19:49 ` Lee Jones
1 sibling, 0 replies; 3+ messages in thread
From: Lee Jones @ 2026-11-19 19:49 UTC (permalink / raw)
To: lee, Aaro Koskinen, Andreas Kemnade, Kevin Hilman, Roger Quadros,
Tony Lindgren, Kai Svahn, syed khasim, linux-omap, mfd,
linux-kernel
Register a devres cleanup action immediately after allocating twl_priv
with devm_kzalloc() so that twl_priv is automatically reset to NULL just
before its underlying memory is released on probe failure or driver
unbind. This removes the need to manually clear twl_priv in both
twl_remove() and the probe error unwind path.
Suggested-by: Andreas Kemnade <andreas@kemnade.info>
Reviewed-by: Andreas Kemnade <andreas@kemnade.info>
Signed-off-by: Lee Jones <lee@kernel.org>
---
v1 => v3: Previously sent standalone - now rebased onto patch 1
drivers/mfd/twl-core.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c
index 7784e000b995..cef729109126 100644
--- a/drivers/mfd/twl-core.c
+++ b/drivers/mfd/twl-core.c
@@ -713,7 +713,6 @@ static void twl_remove(struct i2c_client *client)
twl->client = NULL;
}
twl_priv->ready = false;
- twl_priv = NULL;
}
@@ -735,6 +734,11 @@ static void twl_unregister_device(void *data)
platform_device_unregister(data);
}
+static void twl_reset_priv(void *data)
+{
+ twl_priv = NULL;
+}
+
/* NOTE: This driver only handles a single twl4030/tps659x0 chip */
static int
twl_probe(struct i2c_client *client)
@@ -788,6 +792,10 @@ twl_probe(struct i2c_client *client)
goto out;
}
+ status = devm_add_action_or_reset(&client->dev, twl_reset_priv, NULL);
+ if (status)
+ goto out;
+
if ((id->driver_data) & TWL6030_CLASS) {
twl_priv->twl_id = TWL6030_CLASS_ID;
twl_priv->twl_map = &twl6030_map[0];
@@ -909,9 +917,6 @@ twl_probe(struct i2c_client *client)
if (status < 0)
twl_remove(client);
out:
- if (status < 0)
- twl_priv = NULL;
-
return status;
}
--
2.56.1.750.gf70dc682cf-goog
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2026-11-19 19:49 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-11-19 19:49 [PATCH v3 0/2] mfd: twl-core: Fix dangling twl_priv on teardown and probe failure Lee Jones
2026-11-19 19:49 ` [PATCH v3 1/2] mfd: twl-core: Clear twl_priv pointer " Lee Jones
2026-11-19 19:49 ` [PATCH v3 2/2] mfd: twl-core: Reset twl_priv using devm_add_action_or_reset() Lee Jones
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox