From: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
To: Guangshuo Li <lgs201920130244@gmail.com>,
Liam Girdwood <lgirdwood@gmail.com>,
Mark Brown <broonie@kernel.org>, Jaroslav Kysela <perex@perex.cz>,
Takashi Iwai <tiwai@suse.com>,
Matthias Brugger <matthias.bgg@gmail.com>,
Charles Keepax <ckeepax@opensource.cirrus.com>,
Alexandre Mergnat <amergnat@baylibre.com>,
linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-mediatek@lists.infradead.org
Cc: stable@vger.kernel.org
Subject: Re: [PATCH] ASoC: mediatek: mt8365: Add check for devm_kcalloc() in mt8365_afe_suspend()
Date: Thu, 18 Sep 2025 16:37:30 +0200 [thread overview]
Message-ID: <71f50716-2f8b-432b-970c-9436fa181856@collabora.com> (raw)
In-Reply-To: <20250918140758.3583830-1-lgs201920130244@gmail.com>
Il 18/09/25 16:07, Guangshuo Li ha scritto:
> devm_kcalloc() may fail. mt8365_afe_suspend() uses afe->reg_back_up
> unconditionally after allocation and writes afe->reg_back_up[i], which
> can lead to a NULL pointer dereference under low-memory conditions.
>
> Add a NULL check and bail out with -ENOMEM, making sure to disable the
> main clock via the existing error path to keep clock state balanced.
>
> Fixes: e1991d102bc2 ("ASoC: mediatek: mt8365: Add the AFE driver support")
> Cc: stable@vger.kernel.org
> Signed-off-by: Guangshuo Li <lgs201920130244@gmail.com>
> ---
> sound/soc/mediatek/mt8365/mt8365-afe-pcm.c | 18 +++++++++++-------
> 1 file changed, 11 insertions(+), 7 deletions(-)
>
> diff --git a/sound/soc/mediatek/mt8365/mt8365-afe-pcm.c b/sound/soc/mediatek/mt8365/mt8365-afe-pcm.c
> index 10793bbe9275..9f398d1249ce 100644
> --- a/sound/soc/mediatek/mt8365/mt8365-afe-pcm.c
> +++ b/sound/soc/mediatek/mt8365/mt8365-afe-pcm.c
> @@ -1971,22 +1971,26 @@ static int mt8365_afe_suspend(struct device *dev)
> {
> struct mtk_base_afe *afe = dev_get_drvdata(dev);
> struct regmap *regmap = afe->regmap;
> - int i;
> + int i, ret = 0;
>
> mt8365_afe_enable_main_clk(afe);
>
> - if (!afe->reg_back_up)
> - afe->reg_back_up =
> - devm_kcalloc(dev, afe->reg_back_up_list_num,
> - sizeof(unsigned int), GFP_KERNEL);
> + if (!afe->reg_back_up) {
> + afe->reg_back_up = devm_kcalloc(dev, afe->reg_back_up_list_num,
> + sizeof(unsigned int), GFP_KERNEL);
Nothing else can fail, so using a label here is unnecessary.
if (!afe->reg_back_up) {
mt8365_afe_disable_main_clk(afe);
return -ENOMEM;
}
This makes you able to avoid adding a `ret` variable, and also the goto.
Cheers,
Angelo
next prev parent reply other threads:[~2025-09-18 14:37 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-18 14:07 Guangshuo Li
2025-09-18 14:37 ` AngeloGioacchino Del Regno [this message]
2025-09-22 14:05 Guangshuo Li
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=71f50716-2f8b-432b-970c-9436fa181856@collabora.com \
--to=angelogioacchino.delregno@collabora.com \
--cc=amergnat@baylibre.com \
--cc=broonie@kernel.org \
--cc=ckeepax@opensource.cirrus.com \
--cc=lgirdwood@gmail.com \
--cc=lgs201920130244@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-sound@vger.kernel.org \
--cc=matthias.bgg@gmail.com \
--cc=perex@perex.cz \
--cc=stable@vger.kernel.org \
--cc=tiwai@suse.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
all inboxes | Powered by JetHome®