[PATCH 07/10] iio: adc: qcom-spmi-adc5-gen3: Free TM auxiliary device wrapper in release callback

From: Lee Jones

Date: Thu Nov 19 2026 - 10:33:55 EST


struct tm5_aux_dev_wrapper embeds a reference-counted struct
auxiliary_device, whose memory must be released from its dev.release
callback once the final device reference is dropped.

Allocating the wrapper with devm_kzalloc_obj() on the parent ADC device
and providing an empty adc5_gen3_aux_device_release() causes parent
devres teardown to free the wrapper immediately after
auxiliary_device_uninit(), even if external references to the embedded
struct device are still held.

Allocate the wrapper with kzalloc_obj(), release it from
adc5_gen3_aux_device_release(), and unwind cleanly on early error paths
in adc5_gen3_add_aux_tm_device().

Fixes: baff45179e90 ("iio: adc: Add support for QCOM PMIC5 Gen3 ADC")
Closes: https://sashiko.dev/#/bug/linux-b738d116-f32b-4edf-aa73-77827b79a407
Cc: stable@xxxxxxxxxxxxxxx
Signed-off-by: Lee Jones <lee@xxxxxxxxxx>
---
drivers/iio/adc/qcom-spmi-adc5-gen3.c | 30 +++++++++++++++++++++------
1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/drivers/iio/adc/qcom-spmi-adc5-gen3.c b/drivers/iio/adc/qcom-spmi-adc5-gen3.c
index 351c4fff17b4..52f039795418 100644
--- a/drivers/iio/adc/qcom-spmi-adc5-gen3.c
+++ b/drivers/iio/adc/qcom-spmi-adc5-gen3.c
@@ -24,6 +24,7 @@
#include <linux/platform_device.h>
#include <linux/property.h>
#include <linux/regmap.h>
+#include <linux/slab.h>
#include <linux/types.h>
#include <linux/unaligned.h>

@@ -607,14 +608,20 @@ static void adc5_gen3_delete_aux(void *data)
auxiliary_device_delete(data);
}

-static void adc5_gen3_aux_device_release(struct device *dev) {}
+static void adc5_gen3_aux_device_release(struct device *dev)
+{
+ struct tm5_aux_dev_wrapper *aux_device =
+ container_of(dev, struct tm5_aux_dev_wrapper, aux_dev.dev);
+
+ kfree(aux_device);
+}

static int adc5_gen3_add_aux_tm_device(struct adc5_chip *adc, int id)
{
struct tm5_aux_dev_wrapper *aux_device;
int i, ret, i_tm = 0;

- aux_device = devm_kzalloc_obj(adc->dev, *aux_device);
+ aux_device = kzalloc_obj(*aux_device);
if (!aux_device)
return -ENOMEM;

@@ -626,8 +633,10 @@ static int adc5_gen3_add_aux_tm_device(struct adc5_chip *adc, int id)
aux_device->tm_props = devm_kzalloc_objs(adc->dev,
*aux_device->tm_props,
adc->n_tm_channels);
- if (!aux_device->tm_props)
+ if (!aux_device->tm_props) {
+ kfree(aux_device);
return -ENOMEM;
+ }

aux_device->dev_data = &adc->dev_data;

@@ -643,8 +652,10 @@ static int adc5_gen3_add_aux_tm_device(struct adc5_chip *adc, int id)
aux_device->n_tm_channels = adc->n_tm_channels;

ret = auxiliary_device_init(&aux_device->aux_dev);
- if (ret)
+ if (ret) {
+ kfree(aux_device);
return ret;
+ }

ret = devm_add_action_or_reset(adc->dev, adc5_gen3_uninit_aux,
&aux_device->aux_dev);
@@ -652,12 +663,19 @@ static int adc5_gen3_add_aux_tm_device(struct adc5_chip *adc, int id)
return ret;

ret = auxiliary_device_add(&aux_device->aux_dev);
- if (ret)
+ if (ret) {
+ devm_release_action(adc->dev, adc5_gen3_uninit_aux,
+ &aux_device->aux_dev);
return ret;
+ }
+
ret = devm_add_action_or_reset(adc->dev, adc5_gen3_delete_aux,
&aux_device->aux_dev);
- if (ret)
+ if (ret) {
+ devm_release_action(adc->dev, adc5_gen3_uninit_aux,
+ &aux_device->aux_dev);
return ret;
+ }

return 0;
}
--
2.56.1.708.g77570a6a1d-goog