From dd41e0c4e35abc5a5679762ab108a6fcd9a0ead9 Mon Sep 17 00:00:00 2001
From: Xiubo Li
Date: Fri, 20 Dec 2013 14:39:50 +0800
Subject: [PATCH] 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
Signed-off-by: Mark Brown
---
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 7a9b6b4..be7c1db 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) +
--
2.7.4