From: Kefeng Wang <wangkefeng.wang@huawei.com>
Date: Mon, 24 May 2021 02:49:41 +0000 (+0800)
Subject: ASoC: core: Fix Null-point-dereference in fmt_single_name()
X-Git-Tag: v5.10.44~24
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0e2c9aeb00289f279b8181fbd4c20765127d8943;p=thirdparty%2Fkernel%2Fstable.git

ASoC: core: Fix Null-point-dereference in fmt_single_name()

commit 41daf6ba594d55f201c50280ebcd430590441da1 upstream.

Check the return value of devm_kstrdup() in case of
Null-point-dereference.

Fixes: 45dd9943fce0 ("ASoC: core: remove artificial component and DAI name constraint")
Cc: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
Link: https://lore.kernel.org/r/20210524024941.159952-1-wangkefeng.wang@huawei.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index bf65cba232e67..b22674e3a89c9 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -2231,6 +2231,8 @@ static char *fmt_single_name(struct device *dev, int *id)
 		return NULL;
 
 	name = devm_kstrdup(dev, devname, GFP_KERNEL);
+	if (!name)
+		return NULL;
 
 	/* are we a "%s.%d" name (platform and SPI components) */
 	found = strstr(name, dev->driver->name);