mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-01-16 01:54:00 +00:00
ASoC: SOF: ipc3-topology: fix resource leaks in sof_ipc3_widget_setup_comp_dai()
These error paths should free comp_dai before returning. Fixes: 909dadf21aae ("ASoC: SOF: topology: Make DAI widget parsing IPC agnostic") Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org> Link: https://patch.msgid.link/67d185cf-d139-4f8c-970a-dbf0542246a8@stanley.mountain Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
04c319e05d
commit
6d544ea21d
@ -1588,14 +1588,14 @@ static int sof_ipc3_widget_setup_comp_dai(struct snd_sof_widget *swidget)
|
||||
ret = sof_update_ipc_object(scomp, comp_dai, SOF_DAI_TOKENS, swidget->tuples,
|
||||
swidget->num_tuples, sizeof(*comp_dai), 1);
|
||||
if (ret < 0)
|
||||
goto free;
|
||||
goto free_comp;
|
||||
|
||||
/* update comp_tokens */
|
||||
ret = sof_update_ipc_object(scomp, &comp_dai->config, SOF_COMP_TOKENS,
|
||||
swidget->tuples, swidget->num_tuples,
|
||||
sizeof(comp_dai->config), 1);
|
||||
if (ret < 0)
|
||||
goto free;
|
||||
goto free_comp;
|
||||
|
||||
/* Subtract the base to match the FW dai index. */
|
||||
if (comp_dai->type == SOF_DAI_INTEL_ALH) {
|
||||
@ -1603,7 +1603,8 @@ static int sof_ipc3_widget_setup_comp_dai(struct snd_sof_widget *swidget)
|
||||
dev_err(sdev->dev,
|
||||
"Invalid ALH dai index %d, only Pin numbers >= %d can be used\n",
|
||||
comp_dai->dai_index, INTEL_ALH_DAI_INDEX_BASE);
|
||||
return -EINVAL;
|
||||
ret = -EINVAL;
|
||||
goto free_comp;
|
||||
}
|
||||
comp_dai->dai_index -= INTEL_ALH_DAI_INDEX_BASE;
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user