summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2024-06-24 14:54:34 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-07-25 09:49:16 +0200
commit7f76855a1ed51bbb1d46703db83c026402a97ee0 (patch)
tree62f2e8022991ce9ad8b7640e0de20107c09e1f78
parent16ad1557cae582e79bb82dddd612d9bdfaa11d4c (diff)
downloadlinux-7f76855a1ed51bbb1d46703db83c026402a97ee0.tar.gz
linux-7f76855a1ed51bbb1d46703db83c026402a97ee0.tar.bz2
linux-7f76855a1ed51bbb1d46703db83c026402a97ee0.zip
ALSA: PCM: Allow resume only for suspended streams
[ Upstream commit 1225675ca74c746f09211528588e83b3def1ff6a ] snd_pcm_resume() should bail out if the stream isn't in a suspended state. Otherwise it'd allow doubly resume. Link: https://patch.msgid.link/20240624125443.27808-1-tiwai@suse.de Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--sound/core/pcm_native.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
index 9238abbfb2d6..2b73518e5e31 100644
--- a/sound/core/pcm_native.c
+++ b/sound/core/pcm_native.c
@@ -1781,6 +1781,8 @@ static int snd_pcm_pre_resume(struct snd_pcm_substream *substream,
snd_pcm_state_t state)
{
struct snd_pcm_runtime *runtime = substream->runtime;
+ if (runtime->state != SNDRV_PCM_STATE_SUSPENDED)
+ return -EBADFD;
if (!(runtime->info & SNDRV_PCM_INFO_RESUME))
return -ENOSYS;
runtime->trigger_master = substream;