From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
To: Charles Han <hanchunchao@inspur.com>,
yung-chuan.liao@linux.intel.com, ckeepax@opensource.cirrus.com
Cc: alsa-devel@alsa-project.org, liam.r.girdwood@linux.intel.com,
peter.ujfalusi@linux.intel.com, broonie@kernel.org,
tiwai@suse.com, linux-sound@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] ASoC: intel: sof_sdw: Add check devm_kasprintf() returned value
Date: Wed, 25 Sep 2024 10:46:08 +0200 [thread overview]
Message-ID: <814913ab-903a-4395-bfb9-5fcbb9d3a5f2@linux.intel.com> (raw)
In-Reply-To: <20240925080030.11262-1-hanchunchao@inspur.com>
On 9/25/24 10:00, Charles Han wrote:
> devm_kasprintf() can return a NULL pointer on failure but this
> returned value is not checked.
>
> Fixes: b359760d95ee ("ASoC: intel: sof_sdw: Add simple DAI link creation helper")
> Signed-off-by: Charles Han <hanchunchao@inspur.com>
> ---
> sound/soc/intel/boards/sof_sdw.c | 12 ++++++++++++
> 1 file changed, 12 insertions(+)
>
> diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c
> index d258728d64cf..26917f6f15cf 100644
> --- a/sound/soc/intel/boards/sof_sdw.c
> +++ b/sound/soc/intel/boards/sof_sdw.c
> @@ -919,6 +919,9 @@ static int create_ssp_dailinks(struct snd_soc_card *card,
> char *cpu_dai_name = devm_kasprintf(dev, GFP_KERNEL, "SSP%d Pin", i);
> char *codec_name = devm_kasprintf(dev, GFP_KERNEL, "i2c-%s:0%d",
> ssp_info->acpi_id, j++);
> + if (!name || !cpu_dai_name || !codec_name)
> + return -ENOMEM;
> +
all 3 changes are correct, thanks for the patch. The only nit-pick is
that I would have moved the devm_ allocation + test lower to be
consistent with the coding style which avoids mixing code and declarations.
> int playback = ssp_info->dais[0].direction[SNDRV_PCM_STREAM_PLAYBACK];
> int capture = ssp_info->dais[0].direction[SNDRV_PCM_STREAM_CAPTURE];
>
> @@ -985,6 +988,9 @@ static int create_hdmi_dailinks(struct snd_soc_card *card,
> for (i = 0; i < hdmi_num; i++) {
> char *name = devm_kasprintf(dev, GFP_KERNEL, "iDisp%d", i + 1);
> char *cpu_dai_name = devm_kasprintf(dev, GFP_KERNEL, "iDisp%d Pin", i + 1);
> + if (!name || !cpu_dai_name)
> + return -ENOMEM;
> +
> char *codec_name, *codec_dai_name;
>
> if (intel_ctx->hdmi.idisp_codec) {
> @@ -996,6 +1002,9 @@ static int create_hdmi_dailinks(struct snd_soc_card *card,
> codec_dai_name = "snd-soc-dummy-dai";
> }
>
> + if (!codec_dai_name)
> + return -ENOMEM;
> +
> ret = asoc_sdw_init_simple_dai_link(dev, *dai_links, be_id, name,
> 1, 0, // HDMI only supports playback
> cpu_dai_name, platform_component->name,
> @@ -1019,6 +1028,9 @@ static int create_bt_dailinks(struct snd_soc_card *card,
> SOF_BT_OFFLOAD_SSP_SHIFT;
> char *name = devm_kasprintf(dev, GFP_KERNEL, "SSP%d-BT", port);
> char *cpu_dai_name = devm_kasprintf(dev, GFP_KERNEL, "SSP%d Pin", port);
> + if (!name || !cpu_dai_name)
> + return -ENOMEM;
> +
> int ret;
>
> ret = asoc_sdw_init_simple_dai_link(dev, *dai_links, be_id, name,
next prev parent reply other threads:[~2024-09-25 8:46 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-25 8:00 [PATCH] ASoC: intel: sof_sdw: Add check devm_kasprintf() returned value Charles Han
2024-09-25 8:46 ` Pierre-Louis Bossart [this message]
2024-10-02 17:37 ` Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=814913ab-903a-4395-bfb9-5fcbb9d3a5f2@linux.intel.com \
--to=pierre-louis.bossart@linux.intel.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=ckeepax@opensource.cirrus.com \
--cc=hanchunchao@inspur.com \
--cc=liam.r.girdwood@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sound@vger.kernel.org \
--cc=peter.ujfalusi@linux.intel.com \
--cc=tiwai@suse.com \
--cc=yung-chuan.liao@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox