diff options
| author | Charles Keepax <ckeepax@opensource.cirrus.com> | 2024-12-12 11:57:42 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2024-12-12 12:08:49 +0100 |
| commit | 255cc582e6e16191a20d54bcdbca6c91d3e90c5e (patch) | |
| tree | 33a9e9e3e2cef6c2d1716711c671b79e0b03a354 | |
| parent | ASoC: fsl_spdif: change IFACE_PCM to IFACE_MIXER (diff) | |
| download | linux-255cc582e6e16191a20d54bcdbca6c91d3e90c5e.tar.xz linux-255cc582e6e16191a20d54bcdbca6c91d3e90c5e.zip | |
ASoC: Intel: sof_sdw: Add space for a terminator into DAIs array
The code uses the initialised member of the asoc_sdw_dailink struct to
determine if a member of the array is in use. However in the case the
array is completely full this will lead to an access 1 past the end of
the array, expand the array by one entry to include a space for a
terminator.
Fixes: 27fd36aefa00 ("ASoC: Intel: sof-sdw: Add new code for parsing the snd_soc_acpi structs")
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com>
Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://patch.msgid.link/20241212105742.1508574-1-ckeepax@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>
| -rw-r--r-- | sound/soc/intel/boards/sof_sdw.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c index 810be7c949a5..f3369e569abc 100644 --- a/sound/soc/intel/boards/sof_sdw.c +++ b/sound/soc/intel/boards/sof_sdw.c @@ -1067,8 +1067,12 @@ static int sof_card_dai_links_create(struct snd_soc_card *card) return ret; } - /* One per DAI link, worst case is a DAI link for every endpoint */ - sof_dais = kcalloc(num_ends, sizeof(*sof_dais), GFP_KERNEL); + /* + * One per DAI link, worst case is a DAI link for every endpoint, also + * add one additional to act as a terminator such that code can iterate + * until it hits an uninitialised DAI. + */ + sof_dais = kcalloc(num_ends + 1, sizeof(*sof_dais), GFP_KERNEL); if (!sof_dais) return -ENOMEM; |