xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ASoC: topology: Check name strings of physical DAI links

Browse Source 
Check if the name strings are properly terminated, and only use valid
name strings to find existing physical DAI links to configure.

Signed-off-by: Mengdong Lin <mengdong.lin@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Mengdong Lin
2016-11-05 08:42:14 +08:00
committed by Mark Brown
parent 6ff67ccafd
commit dbab1cb88e
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
sound/soc/soc-topology.c
View File

@@ -1994,10 +1994,24 @@ static int soc_tplg_link_config(struct soc_tplg *tplg,
{ {
struct snd_soc_dai_link *link; struct snd_soc_dai_link *link;
const char *name, *stream_name; const char *name, *stream_name;
size_t len;
int ret; int ret;
name = strlen(cfg->name) ? cfg->name : NULL; len = strnlen(cfg->name, SNDRV_CTL_ELEM_ID_NAME_MAXLEN);
stream_name = strlen(cfg->stream_name) ? cfg->stream_name : NULL; if (len == SNDRV_CTL_ELEM_ID_NAME_MAXLEN)
return -EINVAL;
else if (len)
name = cfg->name;
else
name = NULL;
len = strnlen(cfg->stream_name, SNDRV_CTL_ELEM_ID_NAME_MAXLEN);
if (len == SNDRV_CTL_ELEM_ID_NAME_MAXLEN)
return -EINVAL;
else if (len)
stream_name = cfg->stream_name;
else
stream_name = NULL;
link = snd_soc_find_dai_link(tplg->comp->card, cfg->id, link = snd_soc_find_dai_link(tplg->comp->card, cfg->id,
name, stream_name); name, stream_name);