mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-06 08:46:46 +00:00
ASoC: topology: Check return value for soc_tplg_pcm_create()
[ Upstream commit a3039aef52
]
The return value of soc_tplg_pcm_create() is currently not checked
in soc_tplg_pcm_elems_load(). If an error is to occur there, the
topology ignores it and continues loading.
Fix that by checking the status and rejecting the topology on error.
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: Dragos Tarcatu <dragos_tarcatu@mentor.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20191210003939.15752-3-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
805afc15c6
commit
c75fe29eb1
1 changed files with 7 additions and 1 deletions
|
@ -2031,6 +2031,7 @@ static int soc_tplg_pcm_elems_load(struct soc_tplg *tplg,
|
||||||
int size;
|
int size;
|
||||||
int i;
|
int i;
|
||||||
bool abi_match;
|
bool abi_match;
|
||||||
|
int ret;
|
||||||
|
|
||||||
count = le32_to_cpu(hdr->count);
|
count = le32_to_cpu(hdr->count);
|
||||||
|
|
||||||
|
@ -2072,7 +2073,12 @@ static int soc_tplg_pcm_elems_load(struct soc_tplg *tplg,
|
||||||
}
|
}
|
||||||
|
|
||||||
/* create the FE DAIs and DAI links */
|
/* create the FE DAIs and DAI links */
|
||||||
soc_tplg_pcm_create(tplg, _pcm);
|
ret = soc_tplg_pcm_create(tplg, _pcm);
|
||||||
|
if (ret < 0) {
|
||||||
|
if (!abi_match)
|
||||||
|
kfree(_pcm);
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
/* offset by version-specific struct size and
|
/* offset by version-specific struct size and
|
||||||
* real priv data size
|
* real priv data size
|
||||||
|
|
Loading…
Reference in a new issue