Skip to content

Commit

Permalink
ASoC: imx-audmix: check return value of devm_kasprintf()
Browse files Browse the repository at this point in the history
devm_kasprintf() returns a pointer to dynamically allocated memory.
Pointer could be NULL in case allocation fails. Check pointer validity.
Identified with coccinelle (kmerr.cocci script).

Fixes: b86ef53 ("ASoC: fsl: Add Audio Mixer machine driver")
Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
Link: https://lore.kernel.org/r/20230614121509.443926-1-claudiu.beznea@microchip.com
Signed-off-by: Mark Brown <broonie@kernel.org>
  • Loading branch information
Claudiu Beznea authored and Mark Brown committed Jun 19, 2023
1 parent 997905d commit 2f76e1d
Showing 1 changed file with 9 additions and 0 deletions.
9 changes: 9 additions & 0 deletions sound/soc/fsl/imx-audmix.c
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,8 @@ static int imx_audmix_probe(struct platform_device *pdev)

dai_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, "%s%s",
fe_name_pref, args.np->full_name + 1);
if (!dai_name)
return -ENOMEM;

dev_info(pdev->dev.parent, "DAI FE name:%s\n", dai_name);

Expand All @@ -235,6 +237,8 @@ static int imx_audmix_probe(struct platform_device *pdev)
capture_dai_name =
devm_kasprintf(&pdev->dev, GFP_KERNEL, "%s %s",
dai_name, "CPU-Capture");
if (!capture_dai_name)
return -ENOMEM;
}

/*
Expand Down Expand Up @@ -266,6 +270,8 @@ static int imx_audmix_probe(struct platform_device *pdev)
"AUDMIX-Playback-%d", i);
be_cp = devm_kasprintf(&pdev->dev, GFP_KERNEL,
"AUDMIX-Capture-%d", i);
if (!be_name || !be_pb || !be_cp)
return -ENOMEM;

priv->dai[num_dai + i].cpus = &dlc[1];
priv->dai[num_dai + i].codecs = &asoc_dummy_dlc;
Expand All @@ -288,6 +294,9 @@ static int imx_audmix_probe(struct platform_device *pdev)
priv->dapm_routes[i].source =
devm_kasprintf(&pdev->dev, GFP_KERNEL, "%s %s",
dai_name, "CPU-Playback");
if (!priv->dapm_routes[i].source)
return -ENOMEM;

priv->dapm_routes[i].sink = be_pb;
priv->dapm_routes[num_dai + i].source = be_pb;
priv->dapm_routes[num_dai + i].sink = be_cp;
Expand Down

0 comments on commit 2f76e1d

Please sign in to comment.