From nobody Thu Apr 9 08:09:43 2026 Received: from cstnet.cn (smtp21.cstnet.cn [159.226.251.21]) (using TLSv1.2 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1F2F018859B; Tue, 10 Mar 2026 04:45:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=159.226.251.21 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773117951; cv=none; b=UK1UKlM8rndXD0ICFTMmUNjfpndY2aIOmtReUVQje4iZPseu9QjN76h7sJP3lGsVyd0XobVj+2QQ46nPWZgf9HpfNoG3+HNA5xh6OCSVMnTDdUIiuoEKKgtPPslbJISHzssXKkiQfIUu/J4nf+PO2QBPmnzDZkUmyXCk74N7vIo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773117951; c=relaxed/simple; bh=F5djB+eQJm+wqvcV17a/0nM90yNSjGvpwIycjyTxuKU=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=NkjfbNOcMrfURuNFPt+7YArKdxgKjSHTpy0NdE4L9AZCv0ZCjsOOLhrq94wxv2QDedl+j/B3QbQiIInNhMr07vORcRk5Waz+W2Seb/zHe2oo8YZT1Uhk+Go7dGo50Kre+/e7rajgQAivQ61oudHZP2tPUb8PyEmh88cgdg+24vM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=iscas.ac.cn; spf=pass smtp.mailfrom=iscas.ac.cn; arc=none smtp.client-ip=159.226.251.21 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=iscas.ac.cn Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=iscas.ac.cn Received: from localhost (unknown [124.16.138.129]) by APP-01 (Coremail) with SMTP id qwCowADnj2vnoa9pkkyeCQ--.6715S2; Tue, 10 Mar 2026 12:45:27 +0800 (CST) From: Chen Ni To: Vijendar.Mukunda@amd.com, venkataprasad.potturu@amd.com Cc: lgirdwood@gmail.com, broonie@kernel.org, perex@perex.cz, tiwai@suse.com, kuninori.morimoto.gx@renesas.com, ckeepax@opensource.cirrus.com, AjitKumar.Pandey@amd.com, linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, Chen Ni Subject: [PATCH] ASoC: amd: acp-mach-common: Add missing error check for clock acquisition Date: Tue, 10 Mar 2026 12:43:27 +0800 Message-Id: <20260310044327.2582018-1-nichen@iscas.ac.cn> X-Mailer: git-send-email 2.25.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: qwCowADnj2vnoa9pkkyeCQ--.6715S2 X-Coremail-Antispam: 1UD129KBjvJXoW7Kr48uF13Zry7Jw43Gw13twb_yoW8tFyfpa 4xXa90gayUZFsIva4Fyr4Dur1xXr4xAF4jyasxKa40y3WfKrWrWr4UJw10qFWFyFWkXFnr AFy7GFyfKr4jgFUanT9S1TB71UUUUUDqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUU9K14x267AKxVW8JVW5JwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2ocxC64kIII0Yj41l84x0c7CEw4AK67xGY2AK02 1l84ACjcxK6xIIjxv20xvE14v26r4j6ryUM28EF7xvwVC0I7IYx2IY6xkF7I0E14v26r4j 6F4UM28EF7xvwVC2z280aVAFwI0_Cr1j6rxdM28EF7xvwVC2z280aVCY1x0267AKxVW0oV Cq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0 I7IYx2IY67AKxVWUGVWUXwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r1j6r 4UM4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2IErcIFxwACI402YVCY1x02628v n2kIc2xKxwCY1x0262kKe7AKxVWUtVW8ZwCY02Avz4vE14v_Gryl42xK82IYc2Ij64vIr4 1l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK 67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r1q6r43MIIYrxkI7VAKI48JMIIF0xvE2Ix0cI 8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E14v26r4j6F4UMIIF0xvE42xK8VAv wI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6xkF7I0E14 v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjfUYfOzDUUUU X-CM-SenderInfo: xqlfxv3q6l2u1dvotugofq/ Content-Type: text/plain; charset="utf-8" The acp_card_rt5682_init() and acp_card_rt5682s_init() functions did not check the return values of clk_get(). This could lead to a kernel crash when the invalid pointers are later dereferenced by clock core functions. Fix this by: 1. Changing clk_get() to the device-managed devm_clk_get(). 2. Adding IS_ERR() checks immediately after each clock acquisition. Fixes: 8b7256266848 ("ASoC: amd: acp: Add support for RT5682-VS codec") Fixes: d4c750f2c7d4 ("ASoC: amd: acp: Add generic machine driver support fo= r ACP cards") Signed-off-by: Chen Ni --- sound/soc/amd/acp/acp-mach-common.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/sound/soc/amd/acp/acp-mach-common.c b/sound/soc/amd/acp/acp-ma= ch-common.c index 4d99472c75ba..09f6c9a2c041 100644 --- a/sound/soc/amd/acp/acp-mach-common.c +++ b/sound/soc/amd/acp/acp-mach-common.c @@ -127,8 +127,13 @@ static int acp_card_rt5682_init(struct snd_soc_pcm_run= time *rtd) if (drvdata->hs_codec_id !=3D RT5682) return -EINVAL; =20 - drvdata->wclk =3D clk_get(component->dev, "rt5682-dai-wclk"); - drvdata->bclk =3D clk_get(component->dev, "rt5682-dai-bclk"); + drvdata->wclk =3D devm_clk_get(component->dev, "rt5682-dai-wclk"); + if (IS_ERR(drvdata->wclk)) + return PTR_ERR(drvdata->wclk); + + drvdata->bclk =3D devm_clk_get(component->dev, "rt5682-dai-bclk"); + if (IS_ERR(drvdata->bclk)) + return PTR_ERR(drvdata->bclk); =20 ret =3D snd_soc_dapm_new_controls(dapm, rt5682_widgets, ARRAY_SIZE(rt5682_widgets)); @@ -370,8 +375,13 @@ static int acp_card_rt5682s_init(struct snd_soc_pcm_ru= ntime *rtd) return -EINVAL; =20 if (!drvdata->soc_mclk) { - drvdata->wclk =3D clk_get(component->dev, "rt5682-dai-wclk"); - drvdata->bclk =3D clk_get(component->dev, "rt5682-dai-bclk"); + drvdata->wclk =3D devm_clk_get(component->dev, "rt5682-dai-wclk"); + if (IS_ERR(drvdata->wclk)) + return PTR_ERR(drvdata->wclk); + + drvdata->bclk =3D devm_clk_get(component->dev, "rt5682-dai-bclk"); + if (IS_ERR(drvdata->bclk)) + return PTR_ERR(drvdata->bclk); } =20 ret =3D snd_soc_dapm_new_controls(dapm, rt5682s_widgets, --=20 2.25.1