ASoC: SOF: ipc4-topology: check dai->private in ipc_free()

Set the swidget->private or dai->private to NULL after kfree in the error
handling in ipc_setup(). The private needs to be set NULL because if
ipc_setup() returns error, ipc_free() will be called later. ipc_free()
will judge the private is NULL or not to do the clearing.

For dai widget, dai->private is allocated and set in dai widget
ipc_setup(). So we need to check dai->private is NULL or not
in the ipc_free().

Fixes: da3d3d4d7e53 ("ASoC: SOF: ipc4-topology: Add support for parsing AIF_IN/AIF_OUT widgets")
Fixes: 56a22c21c176 ("ASoC: SOF: ipc4-topology: Add support for parsing DAI_IN/DAI_OUT widgets")
Fixes: 7c117fe181f0 ("ASoC: SOF: ipc4-topology: Add support for parsing and preparing pga widgets")
Fixes: e63ddc5b09a7 ("ASoC: SOF: ipc4-topology: Add support for parsing mixer widgets")
Reviewed-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com>
Signed-off-by: Libin Yang <libin.yang@intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20220708200516.26853-2-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sof/ipc4-topology.c b/sound/soc/sof/ipc4-topology.c
index 34f805431f2eb32a7f04deb443bad1ef8511e2de..2d157ea79db5e80896851d8b2114afe2ff157fc1 100644 (file)
--- a/sound/soc/sof/ipc4-topology.c
+++ b/sound/soc/sof/ipc4-topology.c
@@ -394,6 +394,7 @@ err:
        kfree(available_fmt->dma_buffer_size);
 free_copier:
        kfree(ipc4_copier);
+       swidget->private = NULL;
        return ret;
 }
 
@@ -541,6 +542,8 @@ err:
        kfree(available_fmt->dma_buffer_size);
 free_copier:
        kfree(ipc4_copier);
+       dai->private = NULL;
+       dai->scomp = NULL;
        return ret;
 }
 
@@ -553,6 +556,12 @@ static void sof_ipc4_widget_free_comp_dai(struct snd_sof_widget *swidget)
        if (!dai)
                return;
 
+       if (!dai->private) {
+               kfree(dai);
+               swidget->private = NULL;
+               return;
+       }
+
        ipc4_copier = dai->private;
        available_fmt = &ipc4_copier->available_fmt;
 
@@ -669,6 +678,7 @@ static int sof_ipc4_widget_setup_comp_pga(struct snd_sof_widget *swidget)
        return 0;
 err:
        kfree(gain);
+       swidget->private = NULL;
        return ret;
 }
 
@@ -698,6 +708,7 @@ static int sof_ipc4_widget_setup_comp_mixer(struct snd_sof_widget *swidget)
        return 0;
 err:
        kfree(mixer);
+       swidget->private = NULL;
        return ret;
 }