Commit dd41e0c4 authored Dec 20, 2013 by Xiubo Li Committed by Mark Brown Dec 21, 2013

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>

parent fa558c28

sound/soc/generic/simple-card.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -142,6 +142,9 @@ static int asoc_simple_card_parse_of(struct device_node *node,
		if (ret < 0)
		return ret;

		if (!info->cpu_dai.name \|\| !info->codec_dai.name)
		return -EINVAL;

		/* card name is created from CPU/CODEC dai name */
		name = devm_kzalloc(dev,
		strlen(info->cpu_dai.name) +