2021-10-24 14:05:16

by Pavel Skripkin

Subject: [PATCH next] ALSA: mixer: fix deadlock in snd_mixer_oss_set_volume

In commit 411cef6adfb3 ("ALSA: mixer: oss: Fix racy access to slots")
added mutex protection in snd_mixer_oss_set_volume(). Second
mutex_lock() in same function looks like typo, fix it.

Reported-by: [email protected]
Fixes: 411cef6adfb3 ("ALSA: mixer: oss: Fix racy access to slots")
Signed-off-by: Pavel Skripkin <[email protected]>
---
sound/core/oss/mixer_oss.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/core/oss/mixer_oss.c b/sound/core/oss/mixer_oss.c
index d5ddc154a735..9620115cfdc0 100644
--- a/sound/core/oss/mixer_oss.c
+++ b/sound/core/oss/mixer_oss.c
@@ -313,7 +313,7 @@ static int snd_mixer_oss_set_volume(struct snd_mixer_oss_file *fmixer,
pslot->volume[1] = right;
result = (left & 0xff) | ((right & 0xff) << 8);
unlock:
- mutex_lock(&mixer->reg_mutex);
+ mutex_unlock(&mixer->reg_mutex);
return result;
}

--
2.33.1

2021-10-26 07:15:49

by Takashi Iwai

Subject: Re: [PATCH next] ALSA: mixer: fix deadlock in snd_mixer_oss_set_volume

On Sun, 24 Oct 2021 16:03:15 +0200,
Pavel Skripkin wrote:
>
> In commit 411cef6adfb3 ("ALSA: mixer: oss: Fix racy access to slots")
> added mutex protection in snd_mixer_oss_set_volume(). Second
> mutex_lock() in same function looks like typo, fix it.
>
> Reported-by: [email protected]
> Fixes: 411cef6adfb3 ("ALSA: mixer: oss: Fix racy access to slots")
> Signed-off-by: Pavel Skripkin <[email protected]>

Applied now, thanks!


Takashi