This is a note to let you know that I've just added the patch titled
ASoC: soc-compress: Fix deadlock in soc_compr_open_fe
to the 6.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
asoc-soc-compress-fix-deadlock-in-soc_compr_open_fe.patch
and it can be found in the queue-6.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
commit 96c745f72882e4694b7588b864b2c70703375594
Author: yixuanjiang <yixuanjiang@xxxxxxxxxx>
Date: Mon Jun 19 11:31:27 2023 +0800
ASoC: soc-compress: Fix deadlock in soc_compr_open_fe
[ Upstream commit 2222214749a9969e09454b9ba7febfdfb09c1c8d ]
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")
Signed-off-by: yixuanjiang <yixuanjiang@xxxxxxxxxx>
Link: https://lore.kernel.org/r/20230619033127.2522477-1-yixuanjiang@xxxxxxxxxx
Signed-off-by: Mark Brown <broonie@xxxxxxxxxx>
Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>
diff --git a/sound/soc/soc-compress.c b/sound/soc/soc-compress.c
index d8715db5e415e..2117fd61cf8f3 100644
--- a/sound/soc/soc-compress.c
+++ b/sound/soc/soc-compress.c
@@ -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);
