Skip to contentSkip to conversation

ASoC: soc-compress: Fix deadlock in soc_compr_open_fe

PATCH In review yixuanjiang 2 participants 2 messages Jun 19, 2023 – Jun 21, 2023

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ASoC: soc-compress: Fix deadlock in soc_compr_open_fe

Modify the error handling flow by release lock.
The require mutex will keep holding if open fail.

Fixes aa9ff6a4955f ("ASoC: soc-compress: Reposition and add pcm_mutex")
---
 sound/soc/soc-compress.c | 1 +
 1 file changed, 1 insertion(+)
sound/soc/soc-compress.c +1 -0
index d8715db5e415..2117fd61cf8f 100644
@@ -194,6 +194,7 @@ static int soc_compr_open_fe(struct snd_compr_stream *cstream)
 	snd_soc_dai_compr_shutdown(cpu_dai, cstream, 1);
 out:
 	dpcm_path_put(&list);
+	snd_soc_dpcm_mutex_unlock(fe);
 be_err:
 	fe->dpcm[stream].runtime_update = SND_SOC_DPCM_UPDATE_NO;
 	snd_soc_card_mutex_unlock(fe->card);
Signature · 1 line
2.41.0.162.gfafddb0af9-goog
maintainer
#1 lore raw
Quoted 4 lines · yixuanjiang

Modify the error handling flow by release lock.
The require mutex will keep holding if open fail.

Applied to

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

Thanks!

[1/1] ASoC: soc-compress: Fix deadlock in soc_compr_open_fe

      commit: 2222214749a9969e09454b9ba7febfdfb09c1c8d

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