[0/4] ASoC: topology: Fix route memory corruption

Message

Amadeusz Sławiński June 3, 2024, 10:28 a.m. UTC

Originally reported here:
https://github.com/thesofproject/avs-topology-xml/issues/22#issuecomment-2127892605
There is various level of failure there, first of all when topology
loads routes, it points directly into FW file, but it may be freed after
topology load. After fixing the above, when avs driver parses topology
it should allocate its own memory, as target strings can be shorter than
needed. Also clean up soc_tplg_dapm_graph_elems_load() a bit.

Amadeusz Sławiński (4):
  ASoC: topology: Fix references to freed memory
  ASoC: Intel: avs: Fix route override
  ASoC: topology: Do not assign fields that are already set
  ASoC: topology: Clean up route loading

 sound/soc/intel/avs/topology.c | 19 ++++++++++++----
 sound/soc/soc-topology.c       | 41 ++++++++++++++++++----------------
 2 files changed, 37 insertions(+), 23 deletions(-)

Comments

Mark Brown June 11, 2024, 4:12 p.m. UTC | #1

On Mon, 03 Jun 2024 12:28:14 +0200, Amadeusz Sławiński wrote:
> Originally reported here:
> https://github.com/thesofproject/avs-topology-xml/issues/22#issuecomment-2127892605
> There is various level of failure there, first of all when topology
> loads routes, it points directly into FW file, but it may be freed after
> topology load. After fixing the above, when avs driver parses topology
> it should allocate its own memory, as target strings can be shorter than
> needed. Also clean up soc_tplg_dapm_graph_elems_load() a bit.
> 
> [...]

Applied to

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

Thanks!

[1/4] ASoC: topology: Fix references to freed memory
      commit: 97ab304ecd95c0b1703ff8c8c3956dc6e2afe8e1
[2/4] ASoC: Intel: avs: Fix route override
      commit: fd660b1bd015e5aa9a558ee04088f2431010548d
[3/4] ASoC: topology: Do not assign fields that are already set
      commit: daf0b99d4720c9f05bdb81c73b2efdb43fa9def3
[4/4] ASoC: topology: Clean up route loading
      commit: e0e7bc2cbee93778c4ad7d9a792d425ffb5af6f7

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