Skip to contentSkip to conversation

ASoC: SOF: topology: Add const to tplg_files allocation type

PATCH In review Kees Cook 2 participants 2 messages Sep 17 – Sep 18

Subsystems (3)
lore
Share & tools
lore

Kees Cook

author
#0 lore raw

PATCH 1/1 ASoC: SOF: topology: Add const to tplg_files allocation type

From: Kees Cook <[email protected]>

In preparation for converting the kmalloc family of allocators to the type-aware kmalloc_obj family, we need to make sure that the returned type from the allocation matches the type of the variable being assigned. (The kmalloc family returns "void *", which can be implicitly cast to any pointer type.)

The assigned type is "const char **", but the converted allocation type would be "char **", which is the same type without the const qualifier. As there is no general way to safely add const qualifiers, take the size from the assignment target instead. No change in allocation size results.

Build tested ARCH=x86_64 allmodconfig with GCC 16.2.0:
sound/soc/sof/topology.o

Assisted-by LLM coccinelle

---
Cc: Liam Girdwood <[email protected]>
Cc: Peter Ujfalusi <[email protected]>
Cc: Bard Liao <[email protected]>
Cc: Daniel Baluta <[email protected]>
Cc: Kai Vehmanen <[email protected]>
Cc: Pierre-Louis Bossart <[email protected]>
Cc: Vijendar Mukunda <[email protected]>
Cc: Mark Brown <[email protected]>
Cc: Jaroslav Kysela <[email protected]>
Cc: Takashi Iwai <[email protected]>
Cc: <[email protected]>
Cc: <[email protected]>

---
 sound/soc/sof/topology.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
sound/soc/sof/topology.c +2 -1
index 8338133899ab..145bad472118 100644
@@ -2517,7 +2517,8 @@ int snd_sof_load_topology(struct snd_soc_component *scomp, const char *file)
 	int i;
 
 	const char **tplg_files __free(kfree) =
-		kcalloc(scomp->card->num_links, sizeof(char *), GFP_KERNEL);
+		kcalloc(scomp->card->num_links, sizeof(*tplg_files),
+			GFP_KERNEL);
 	if (!tplg_files)
 		return -ENOMEM;
 
Signature · 1 line
2.34.1
maintainer
#1 lore raw
Quoted 1 line · Kees Cook

ASoC: SOF: topology: Add const to tplg_files allocation type

Applied to

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

Thanks!

[1/1] ASoC: SOF: topology: Add const to tplg_files allocation type

      https://git.kernel.org/broonie/sound/c/cbcb58ad7a19

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