openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ASoC: simple-card: Add cpu_dai and codec_dai names NULL check 

The name of cpu DAI maybe omitted, and then strlen() will lead
kernel panic.

Signed-off-by: Xiubo Li <Li.Xiubo@freescale.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
This commit is contained in:
Xiubo Li 2013-12-20 14:39:50 +08:00 committed by Mark Brown
parent fa558c2801
commit dd41e0c4e3
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sound/soc/generic/simple-card.c
View File

@ -142,6 +142,9 @@ static int asoc_simple_card_parse_of(struct device_node *node,
if (ret < 0) if (ret < 0)
return ret; return ret;
if (!info->cpu_dai.name || !info->codec_dai.name)
return -EINVAL;
/* card name is created from CPU/CODEC dai name */ /* card name is created from CPU/CODEC dai name */
name = devm_kzalloc(dev, name = devm_kzalloc(dev,
strlen(info->cpu_dai.name) + strlen(info->cpu_dai.name) +