Skip to contentSkip to conversation

ASoC: SOF: topology: Fix memory leak of scontrol->name

PATCH In review Peter Ujfalusi 2 participants 2 messages Mar 31, 2022 – Apr 5, 2022

Subsystems (3)
lore
Share & tools
lore

Peter Ujfalusi

author maintainer
#0 lore raw

PATCH 1/1 ASoC: SOF: topology: Fix memory leak of scontrol->name

The scontrol->name is allocated with kstrdup, it must be freed before the scontrol is freed to avoid leaking memory.

The constant leaking happens via sof_widget_unload() path on every module removal.

Fixes b5cee8feb1d48 ("ASoC: SOF: topology: Make control parsing IPC agnostic")
---
 sound/soc/sof/topology.c | 3 +++
 1 file changed, 3 insertions(+)
sound/soc/sof/topology.c +3 -0
index 9b11e9795a7a..75d78f9178a3 100644
@@ -941,11 +941,13 @@ static int sof_control_load(struct snd_soc_component *scomp, int index,
 	default:
 		dev_warn(scomp->dev, "control type not supported %d:%d:%d\n",
 			 hdr->ops.get, hdr->ops.put, hdr->ops.info);
+		kfree(scontrol->name);
 		kfree(scontrol);
 		return 0;
 	}
 
 	if (ret < 0) {
+		kfree(scontrol->name);
 		kfree(scontrol);
 		return ret;
 	}
@@ -1380,6 +1382,7 @@ static int sof_widget_unload(struct snd_soc_component *scomp,
 		}
 		kfree(scontrol->ipc_control_data);
 		list_del(&scontrol->list);
+		kfree(scontrol->name);
 		kfree(scontrol);
 	}
 
Signature · 1 line
2.35.1
maintainer
#1 lore raw
Quoted 8 lines · Peter Ujfalusi

The scontrol->name is allocated with kstrdup, it must be freed before the scontrol is freed to avoid leaking memory.

The constant leaking happens via sof_widget_unload() path on every module removal.

[...]

Applied to

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

Thanks!

[1/1] ASoC: SOF: topology: Fix memory leak of scontrol->name

      commit: 5708cc2f4b50c7bf27234eee77e1d9487533bbd3

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