diff mbox series

ASoC: Intel: Skylake: Fix mem leak when parsing UUIDs fails

Message ID 20231026082558.1864910-1-amadeuszx.slawinski@linux.intel.com (mailing list archive)
State Accepted
Commit 168d97844a61db302dec76d44406e9d4d7106b8e
Headers show
Series ASoC: Intel: Skylake: Fix mem leak when parsing UUIDs fails | expand

Commit Message

Amadeusz Sławiński Oct. 26, 2023, 8:25 a.m. UTC 
From: Cezary Rojewski <cezary.rojewski@intel.com>

Error path in snd_skl_parse_uuids() shall free last allocated module if
its instance_id allocation fails.

Fixes: f8e066521192 ("ASoC: Intel: Skylake: Fix uuid_module memory leak in failure case")
Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com>
Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
---
 sound/soc/intel/skylake/skl-sst-utils.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Mark Brown Oct. 26, 2023, 12:50 p.m. UTC | #1 
On Thu, 26 Oct 2023 10:25:58 +0200, Amadeusz Sławiński wrote:
> Error path in snd_skl_parse_uuids() shall free last allocated module if
> its instance_id allocation fails.
> 
> 

Applied to

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

Thanks!

[1/1] ASoC: Intel: Skylake: Fix mem leak when parsing UUIDs fails
      commit: 168d97844a61db302dec76d44406e9d4d7106b8e

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
diff mbox series

Patch

diff --git a/sound/soc/intel/skylake/skl-sst-utils.c b/sound/soc/intel/skylake/skl-sst-utils.c
index 57ea815d3f04..b776c58dcf47 100644
--- a/sound/soc/intel/skylake/skl-sst-utils.c
+++ b/sound/soc/intel/skylake/skl-sst-utils.c
@@ -299,6 +299,7 @@  int snd_skl_parse_uuids(struct sst_dsp *ctx, const struct firmware *fw,
 		module->instance_id = devm_kzalloc(ctx->dev, size, GFP_KERNEL);
 		if (!module->instance_id) {
 			ret = -ENOMEM;
+			kfree(module);
 			goto free_uuid_list;
 		}