aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/sound/soc/soc-core.c
diff options
context:
space:
mode:
authorMark Brown <broonie@sirena.org.uk>2021-05-25 16:44:26 +0100
committerMark Brown <broonie@sirena.org.uk>2021-05-25 16:44:26 +0100
commitd4e9889b02014a07c8dba3fbbae7205ea4084350 (patch)
tree66038b2d9e18c8a63ccc3ef7ff96809e96136bac /sound/soc/soc-core.c
parentMerge series "ASoC: rsnd: add D3 support" from Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>: (diff)
parentASoC: core: Fix Null-point-dereference in fmt_single_name() (diff)
downloadwireguard-linux-d4e9889b02014a07c8dba3fbbae7205ea4084350.tar.xz
wireguard-linux-d4e9889b02014a07c8dba3fbbae7205ea4084350.zip
Merge branch 'for-5.13' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-5.14
Diffstat (limited to 'sound/soc/soc-core.c')
-rw-r--r--sound/soc/soc-core.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 2d969e31f37d..962c527a1d1e 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -2225,6 +2225,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);