[PATCH 5.10 109/131] ASoC: core: Fix Null-point-dereference in fmt_single_name()

From: Greg Kroah-Hartman
Date: Mon Jun 14 2021 - 07:18:39 EST


From: Kefeng Wang <wangkefeng.wang@xxxxxxxxxx>

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@xxxxxxxxxx>
Reported-by: Hulk Robot <hulkci@xxxxxxxxxx>
Signed-off-by: Kefeng Wang <wangkefeng.wang@xxxxxxxxxx>
Link: https://lore.kernel.org/r/20210524024941.159952-1-wangkefeng.wang@xxxxxxxxxx
Signed-off-by: Mark Brown <broonie@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
sound/soc/soc-core.c | 2 ++
1 file changed, 2 insertions(+)

--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -2231,6 +2231,8 @@ static char *fmt_single_name(struct devi
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);