[PATCH] ASoC: meson: aiu: Fix resource leak

[PATCH] ASoC: meson: aiu: Fix resource leak

[Ethan Tidmore]

In snd_soc_register_component() error path, the aiu-formatter is not
being freed. Instead of returning now goto the err tag so the
aiu-formatter can properly be freed.

Fixes: 83b83024cdbfd ("ASoC: meson: aiu: use aiu-formatter-i2s to format I2S output data")
Signed-off-by: Ethan Tidmore <ethantidmore06@gmail.com>
---
 sound/soc/meson/aiu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/soc/meson/aiu.c b/sound/soc/meson/aiu.c
index 64ace4d25d92..d6b644a53f7e 100644
--- a/sound/soc/meson/aiu.c
+++ b/sound/soc/meson/aiu.c
@@ -310,7 +310,7 @@ static int aiu_probe(struct platform_device *pdev)
 					 ARRAY_SIZE(aiu_cpu_dai_drv));
 	if (ret) {
 		dev_err(dev, "Failed to register cpu component\n");
-		return ret;
+		goto err;
 	}
 
 	/* Register the hdmi codec control component */
-- 
Thanks,
ET
https://github.com/sponsors/ethantidmore

Re: [PATCH] ASoC: meson: aiu: Fix resource leak

[Valerio Setti]

On 7/7/26 3:24 AM, Ethan Tidmore wrote:
> In snd_soc_register_component() error path, the aiu-formatter is not
> being freed. Instead of returning now goto the err tag so the
> aiu-formatter can properly be freed.
> 
> Fixes: 83b83024cdbfd ("ASoC: meson: aiu: use aiu-formatter-i2s to format I2S output data")
> Signed-off-by: Ethan Tidmore <ethantidmore06@gmail.com>
> ---
>   sound/soc/meson/aiu.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/sound/soc/meson/aiu.c b/sound/soc/meson/aiu.c
> index 64ace4d25d92..d6b644a53f7e 100644
> --- a/sound/soc/meson/aiu.c
> +++ b/sound/soc/meson/aiu.c
> @@ -310,7 +310,7 @@ static int aiu_probe(struct platform_device *pdev)
>   					 ARRAY_SIZE(aiu_cpu_dai_drv));
>   	if (ret) {
>   		dev_err(dev, "Failed to register cpu component\n");
> -		return ret;
> +		goto err;
>   	}
>   
>   	/* Register the hdmi codec control component */

Technically the fix is OK, but I don't think the commit title and 
message are correct. aiu-formatter data is allocated in 
'gx_formatter_create' using 'devm_kzalloc' so, unless I'm missing 
something, the data should be automatically freed when the device is 
removed in case of error.
What 'gx_formatter_free' does is simply clearing widget's private 
pointer (i.e. 'w->priv'). I think that not clearing it should not have 
any bad consequence since the pointer would be overwritten on the next 
probe. However I agree that for consistency reasons it's a good thing to 
clear to do when 'aiu_probe' fails.

So perhaps the title should be rewritten to something like "ASoC: meson: 
aiu: reset widget private data on probe error path"?

-- 
Valerio

Re: [PATCH] ASoC: meson: aiu: Fix resource leak

[Markus Elfring]

…
> > +++ b/sound/soc/meson/aiu.c
> > @@ -310,7 +310,7 @@ static int aiu_probe(struct platform_device *pdev)
> >   					 ARRAY_SIZE(aiu_cpu_dai_drv));
> >   	if (ret) {
> >   		dev_err(dev, "Failed to register cpu component\n");
> > -		return ret;
> > +		goto err;
> >   	}
> >   
> >   	/* Register the hdmi codec control component */
> 
> Technically the fix is OK, …

I doubt it.

How can a snd_soc_unregister_component(dev) call ever fit to a failed
snd_soc_register_component() call (according to the presented suggestion)?
https://elixir.bootlin.com/linux/v7.2-rc1/source/sound/soc/meson/aiu.c#L240-L315

Regards,
Markus

Re: [PATCH] ASoC: meson: aiu: Fix resource leak

[Valerio Setti]

On 7/10/26 1:27 PM, Markus Elfring wrote:
> …
>>> +++ b/sound/soc/meson/aiu.c
>>> @@ -310,7 +310,7 @@ static int aiu_probe(struct platform_device *pdev)
>>>    					 ARRAY_SIZE(aiu_cpu_dai_drv));
>>>    	if (ret) {
>>>    		dev_err(dev, "Failed to register cpu component\n");
>>> -		return ret;
>>> +		goto err;
>>>    	}
>>>    
>>>    	/* Register the hdmi codec control component */
>>
>> Technically the fix is OK, …
> 
> I doubt it.
> 
> How can a snd_soc_unregister_component(dev) call ever fit to a failed
> snd_soc_register_component() call (according to the presented suggestion)?
> https://elixir.bootlin.com/linux/v7.2-rc1/source/sound/soc/meson/aiu.c#L240-L315

The reply was based on the fact that looking at 
'snd_soc_unregister_component' that's a macro for 
'snd_soc_unregister_component_by_driver'. The latter cycles through all 
registered components and if nothing is found related to the given dev, 
then it results in a no-op.
So calling 'snd_soc_unregister_component' on a failed 
'snd_soc_register_component' looked harmless to me.

What did I miss?

-- 
Valerio