tmakin/tegra-linux-noble
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ASoC: dapm: fix bounds checker error in dapm_widget_list_create

Browse Source 
BugLink: https://bugs.launchpad.net/bugs/2099996

[ Upstream commit 2ef9439f7a19fd3d43b288d38b1c6e55b668a4fe ]

The widgets array in the snd_soc_dapm_widget_list has a __counted_by
attribute attached to it, which points to the num_widgets variable. This
attribute is used in bounds checking, and if it is not set before the
array is filled, then the bounds sanitizer will issue a warning or a
kernel panic if CONFIG_UBSAN_TRAP is set.

This patch sets the size of the widgets list calculated with
list_for_each as the initial value for num_widgets as it is used for
allocating memory for the array. It is updated with the actual number of
added elements after the array is filled.

Signed-off-by: Aleksei Vetrov <vvvvvv@google.com>
Fixes: 80e698e2df ("ASoC: soc-dapm: Annotate struct snd_soc_dapm_widget_list with __counted_by")
Link: https://patch.msgid.link/20241028-soc-dapm-bounds-checker-fix-v1-1-262b0394e89e@google.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
CVE-2024-53045
Signed-off-by: Koichiro Den <koichiro.den@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
This commit is contained in:
Aleksei Vetrov
2025-02-25 22:59:22 +09:00
committed by Stefan Bader
parent 70ab3c8180
commit 1d41774e84
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sound/soc/soc-dapm.c
+2
View File
@@ -1148,6 +1148,8 @@ static int dapm_widget_list_create(struct snd_soc_dapm_widget_list **list,
if (*list == NULL)
return -ENOMEM;
(*list)->num_widgets = size;
list_for_each_entry(w, widgets, work_list)
(*list)->widgets[i++] = w;