[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <dcb6023b-8c14-4bbd-9bac-2933e91ef553@wanadoo.fr>
Date: Mon, 22 Sep 2025 17:43:28 +0200
From: Christophe JAILLET <christophe.jaillet@...adoo.fr>
To: Guangshuo Li <lgs201920130244@...il.com>,
Liam Girdwood <lgirdwood@...il.com>, Mark Brown <broonie@...nel.org>,
Jaroslav Kysela <perex@...ex.cz>, Takashi Iwai <tiwai@...e.com>,
Matthias Brugger <matthias.bgg@...il.com>,
AngeloGioacchino Del Regno <angelogioacchino.delregno@...labora.com>,
Charles Keepax <ckeepax@...nsource.cirrus.com>,
Alexandre Mergnat <amergnat@...libre.com>, linux-sound@...r.kernel.org,
linux-kernel@...r.kernel.org, linux-arm-kernel@...ts.infradead.org,
linux-mediatek@...ts.infradead.org
Cc: stable@...r.kernel.org
Subject: Re: [PATCH v2] ASoC: mediatek: mt8365: Add check for devm_kcalloc()
in mt8365_afe_suspend()
Le 22/09/2025 à 17:34, Guangshuo Li a écrit :
> 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@...r.kernel.org
> ---
> changelog:
> v2:
> - Return -ENOMEM directly on allocation failure without goto/label.
> - Disable the main clock before returning to keep clock state balanced.
>
> Signed-off-by: Guangshuo Li <lgs201920130244@...il.com>
This should be above the ---
> ---
> sound/soc/mediatek/mt8365/mt8365-afe-pcm.c | 10 +++++++---
> 1 file changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/sound/soc/mediatek/mt8365/mt8365-afe-pcm.c b/sound/soc/mediatek/mt8365/mt8365-afe-pcm.c
> index 10793bbe9275..55d832e05072 100644
> --- a/sound/soc/mediatek/mt8365/mt8365-afe-pcm.c
> +++ b/sound/soc/mediatek/mt8365/mt8365-afe-pcm.c
> @@ -1975,11 +1975,15 @@ static int mt8365_afe_suspend(struct device *dev)
>
> mt8365_afe_enable_main_clk(afe);
>
> - if (!afe->reg_back_up)
> + if (!afe->reg_back_up) {
> afe->reg_back_up =
> devm_kcalloc(dev, afe->reg_back_up_list_num,
> - sizeof(unsigned int), GFP_KERNEL);
> -
> + sizeof(unsigned int), GFP_KERNEL);
you should not remove a space here.
CJ
> + if (!afe->reg_back_up) {
> + mt8365_afe_disable_main_clk(afe);
> + return -ENOMEM;
> + }
> + }
> for (i = 0; i < afe->reg_back_up_list_num; i++)
> regmap_read(regmap, afe->reg_back_up_list[i],
> &afe->reg_back_up[i]);
Powered by blists - more mailing lists