Skip to contentSkip to conversation

ASoC: wm_adsp_fw_find_test: Fix missing NULL terminator on file name list

PATCH In review Richard Fitzgerald 2 participants 2 messages Mar 26

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ASoC: wm_adsp_fw_find_test: Fix missing NULL terminator on file name list

The array wm_adsp_fw_find_test_dir_all_files[] needs a NULL terminator.

It was documented at line 41 that dir_files points to a NULL-terminated array.

/* NULL-terminated array of pointers to filenames ... <snip> */ const char * const *dir_files;

This fixes the error reported by KASAN:

[17:46:43] BUG: KASAN: global-out-of-bounds in
wm_adsp_fw_find_test_pick_file+0x8cc/0xc80
[17:46:43] Read of size 8 at addr ffff800081e5ffe8 by task
kunit_try_catch/18349

Fixes bf2d44d07de7 ("ASoC: wm_adsp: Add kunit test for firmware file search")
---
 sound/soc/codecs/wm_adsp_fw_find_test.c | 1 +
 1 file changed, 1 insertion(+)
sound/soc/codecs/wm_adsp_fw_find_test.c +1 -0
index fb886dc61c27..d0c7fb30a95d 100644
@@ -1041,6 +1041,7 @@ static const char * const wm_adsp_fw_find_test_dir_all_files[] = {
 	"cirrus/cs1234-dsp1-mbc-vss.bin",
 	"cirrus/wm1234-dsp1-mbc-vss.bin",
 	"wm1234-dsp1-mbc-vss.bin",
+	NULL /* terminator */
 };
 
 /*
Signature · 1 line
2.47.3
maintainer
#1 lore raw
Quoted 1 line · Richard Fitzgerald

ASoC: wm_adsp_fw_find_test: Fix missing NULL terminator on file name list

Applied to

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-7.1

Thanks!

[1/1] ASoC: wm_adsp_fw_find_test: Fix missing NULL terminator on file name list

      https://git.kernel.org/broonie/sound/c/951a4e8589b3

All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying to this mail.

Thanks,
Mark