* [PATCH v3 1/2] mfd: twl-core: Clear twl_priv pointer on teardown and probe failure
[not found] <20261119194939.2436337-1-lee@kernel.org>
@ 2026-11-19 19:49 ` Lee Jones
0 siblings, 0 replies; only message 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] only message in thread
only message in thread, other threads:[~2026-11-19 19:49 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20261119194939.2436337-1-lee@kernel.org>
2026-11-19 19:49 ` [PATCH v3 1/2] mfd: twl-core: Clear twl_priv pointer on teardown and probe failure Lee Jones
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox