From nobody Fri Dec 19 17:35:44 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DA3C51E621C; Sun, 24 Mar 2024 22:54:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711320841; cv=none; b=Rvs1KvB0RfRdeuBWfu/n7YEqEwnt/X+7H62OnKZW21guKkoGCOq1TaX/80pt5Ul1CZvcc+9xfqI3iyslLqXsWX0wjga43CkXRX5pQydFX1qAM6wF/Je04rMfXydZvMZGfqC6iIQN9d6iiMy4c+zwKqXrNXGYPwTrEgPHis8fuDo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711320841; c=relaxed/simple; bh=uxy3V+RQwm6GDIBtMAfPP7EnSHK32Sx43UE/yYHa5U0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=EqJmG01c/Yi3AQH5pciyBCFMrwM+qxXWzSIxbwyt7aXqnPQfgUHLWrHBgusVUmUvKEF/qIKYfwpCG6QM7E2lX/UAnbDqr1ZDCxomQnPNkUsfv7UhT4pnCgONkFFriFReXDWEh3oERHEEbwrMFeyck+gS/5N/4QTzYZe9fY46T+c= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=isYAnDzo; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="isYAnDzo" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0B145C433C7; Sun, 24 Mar 2024 22:53:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711320840; bh=uxy3V+RQwm6GDIBtMAfPP7EnSHK32Sx43UE/yYHa5U0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=isYAnDzoS+aQi2dUdbMHItYTCUxju21CumDa+YjGaFQo7hA9kIFSTIL9Klbm8PUS/ OiNUCx8auxbb/bPJwumROx79GHxqvrfyN9UfIVf9R22yw2yM68mb/KNlkYv0EFKMcW e6R6mBCUJV/XZaFo33j3d18HSV9mYVpwkak7H8d5qgn9i/j0pIlfzbE2X753Kw8Uus 9JAZygTSKB4NnQT9ztnMSVb5pIQe/ouYYt+ebLYJsWM1YW5rDWC/3vDYtrcEZnRAd1 HBmXFlwDymRFElHgUXsKYGzRIId+9L7nB9h8Jvs/c+mSab2jAwGy8RgyTkZnX4N9Dj 7SupLDmTXvWmA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Cristian Ciocaltea , Emil Velikov , Mark Brown , Sasha Levin Subject: [PATCH 6.7 406/713] ASoC: SOF: amd: Fix memory leak in amd_sof_acp_probe() Date: Sun, 24 Mar 2024 18:42:12 -0400 Message-ID: <20240324224720.1345309-407-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240324224720.1345309-1-sashal@kernel.org> References: <20240324224720.1345309-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Cristian Ciocaltea [ Upstream commit 222be59e5eed1554119294edc743ee548c2371d0 ] Driver uses kasprintf() to initialize fw_{code,data}_bin members of struct acp_dev_data, but kfree() is never called to deallocate the memory, which results in a memory leak. Fix the issue by switching to devm_kasprintf(). Additionally, ensure the allocation was successful by checking the pointer validity. Fixes: f7da88003c53 ("ASoC: SOF: amd: Enable signed firmware image loading = for Vangogh platform") Signed-off-by: Cristian Ciocaltea Reviewed-by: Emil Velikov Link: https://msgid.link/r/20231219030728.2431640-6-cristian.ciocaltea@coll= abora.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/sof/amd/acp.c | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/sound/soc/sof/amd/acp.c b/sound/soc/sof/amd/acp.c index 603ea5fc0d0d4..c6f637f298476 100644 --- a/sound/soc/sof/amd/acp.c +++ b/sound/soc/sof/amd/acp.c @@ -547,17 +547,27 @@ int amd_sof_acp_probe(struct snd_sof_dev *sdev) adata->signed_fw_image =3D false; dmi_id =3D dmi_first_match(acp_sof_quirk_table); if (dmi_id && dmi_id->driver_data) { - adata->fw_code_bin =3D kasprintf(GFP_KERNEL, "%s/sof-%s-code.bin", - plat_data->fw_filename_prefix, - chip->name); - adata->fw_data_bin =3D kasprintf(GFP_KERNEL, "%s/sof-%s-data.bin", - plat_data->fw_filename_prefix, - chip->name); - adata->signed_fw_image =3D dmi_id->driver_data; + adata->fw_code_bin =3D devm_kasprintf(sdev->dev, GFP_KERNEL, + "%s/sof-%s-code.bin", + plat_data->fw_filename_prefix, + chip->name); + if (!adata->fw_code_bin) { + ret =3D -ENOMEM; + goto free_ipc_irq; + } + + adata->fw_data_bin =3D devm_kasprintf(sdev->dev, GFP_KERNEL, + "%s/sof-%s-data.bin", + plat_data->fw_filename_prefix, + chip->name); + if (!adata->fw_data_bin) { + ret =3D -ENOMEM; + goto free_ipc_irq; + } =20 - dev_dbg(sdev->dev, "fw_code_bin:%s, fw_data_bin:%s\n", adata->fw_code_bi= n, - adata->fw_data_bin); + adata->signed_fw_image =3D dmi_id->driver_data; } + adata->enable_fw_debug =3D enable_fw_debug; acp_memory_init(sdev); =20 --=20 2.43.0