mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH] ASoC: simple-card: Add cpu_dai and codec_dai names NULL check
@ 2013-12-20  6:39 Xiubo Li
  2013-12-20  6:39 ` [PATCH] ASoC: soc-core: Fix the DAI name getting Xiubo Li
  2013-12-21 14:42 ` [PATCH] ASoC: simple-card: Add cpu_dai and codec_dai names NULL check Mark Brown
  0 siblings, 2 replies; 4+ messages in thread
From: Xiubo Li @ 2013-12-20  6:39 UTC (permalink / raw)
  To: broonie, perex, tiwai, kuninori.morimoto.gx
  Cc: fabio.estevam, alsa-devel, linux-kernel

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

Signed-off-by: Xiubo Li <Li.Xiubo@freescale.com>
---
 sound/soc/generic/simple-card.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index 3d190d0..1d87db8 100644
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -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)   +
-- 
1.8.4



^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2013-12-31 16:30 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-12-20  6:39 [PATCH] ASoC: simple-card: Add cpu_dai and codec_dai names NULL check Xiubo Li
2013-12-20  6:39 ` [PATCH] ASoC: soc-core: Fix the DAI name getting Xiubo Li
2013-12-31 16:30   ` Mark Brown
2013-12-21 14:42 ` [PATCH] ASoC: simple-card: Add cpu_dai and codec_dai names NULL check Mark Brown

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®