]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ASoC: codecs: wcd937x: fix a potential memory leak in wcd937x_soc_codec_probe()
authorHaoxiang Li <haoxiang_li2024@163.com>
Wed, 26 Feb 2025 08:50:50 +0000 (16:50 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 20 Apr 2025 08:18:07 +0000 (10:18 +0200)
commit 3e330acf4efd63876d673c046cd073a1d4ed57a8 upstream.

When snd_soc_dapm_new_controls() or snd_soc_dapm_add_routes() fails,
wcd937x_soc_codec_probe() returns without releasing 'wcd937x->clsh_info',
which is allocated by wcd_clsh_ctrl_alloc. Add wcd_clsh_ctrl_free()
to prevent potential memory leak.

Fixes: 313e978df7fc ("ASoC: codecs: wcd937x: add audio routing and Kconfig")
Cc: stable@vger.kernel.org
Signed-off-by: Haoxiang Li <haoxiang_li2024@163.com>
Link: https://patch.msgid.link/20250226085050.3584898-1-haoxiang_li2024@163.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
sound/soc/codecs/wcd937x.c

index c9d5e67bf66e4e8e21a76cfd563c75bac6555513..951fd1caf847763fc5356f562a60e3d91d14bbda 100644 (file)
@@ -2563,6 +2563,7 @@ static int wcd937x_soc_codec_probe(struct snd_soc_component *component)
                                                ARRAY_SIZE(wcd9375_dapm_widgets));
                if (ret < 0) {
                        dev_err(component->dev, "Failed to add snd_ctls\n");
+                       wcd_clsh_ctrl_free(wcd937x->clsh_info);
                        return ret;
                }
 
@@ -2570,6 +2571,7 @@ static int wcd937x_soc_codec_probe(struct snd_soc_component *component)
                                              ARRAY_SIZE(wcd9375_audio_map));
                if (ret < 0) {
                        dev_err(component->dev, "Failed to add routes\n");
+                       wcd_clsh_ctrl_free(wcd937x->clsh_info);
                        return ret;
                }
        }