summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorSamuel Holland <samuel@sholland.org>2020-02-13 00:11:44 -0600
committerMark Brown <broonie@kernel.org>2020-02-13 13:14:49 +0000
commitb6570fdb96edf45bcf71884bd2644bd73d348d1a (patch)
treedaa1b2315c727e49efd5e39ad30ffc03d04d5f3e /sound
parent1880b1f1d686b17387b5bf45654eb1d087ead918 (diff)
ASoC: codec2codec: avoid invalid/double-free of pcm runtime
The PCM runtime was freed during PMU in the case that the event hook encountered an error. However, it is also unconditionally freed during PMD. Avoid a double-free by dropping the call to kfree in the PMU hook. Fixes: a72706ed8208 ("ASoC: codec2codec: remove ephemeral variables") Cc: stable@vger.kernel.org Signed-off-by: Samuel Holland <samuel@sholland.org> Link: https://lore.kernel.org/r/20200213061147.29386-2-samuel@sholland.org Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/soc-dapm.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index bc20ad9abf8b..8b24396675ec 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -3916,9 +3916,6 @@ snd_soc_dai_link_event_pre_pmu(struct snd_soc_dapm_widget *w,
runtime->rate = params_rate(params);
out:
- if (ret < 0)
- kfree(runtime);
-
kfree(params);
return ret;
}