Commit 6f9e33f2 authored by Takashi Iwai's avatar Takashi Iwai Committed by Luis Henriques

ALSA: emux: Fix mutex deadlock at unloading

commit 07b0e5d4 upstream.

The emux-synth driver has a possible AB/BA mutex deadlock at unloading
the emu10k1 driver:

  snd_emux_free() ->
    snd_emux_detach_seq(): mutex_lock(&emu->register_mutex) ->
      snd_seq_delete_kernel_client() ->
        snd_seq_free_client(): mutex_lock(&register_mutex)

  snd_seq_release() ->
    snd_seq_free_client(): mutex_lock(&register_mutex) ->
      snd_seq_delete_all_ports() ->
        snd_emux_unuse(): mutex_lock(&emu->register_mutex)

Basically snd_emux_detach_seq() doesn't need a protection of
emu->register_mutex as it's already being unregistered.  So, we can
get rid of this for avoiding the deadlock.
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarLuis Henriques <luis.henriques@canonical.com>
parent e45af6c8
...@@ -124,12 +124,10 @@ snd_emux_detach_seq(struct snd_emux *emu) ...@@ -124,12 +124,10 @@ snd_emux_detach_seq(struct snd_emux *emu)
if (emu->voices) if (emu->voices)
snd_emux_terminate_all(emu); snd_emux_terminate_all(emu);
mutex_lock(&emu->register_mutex);
if (emu->client >= 0) { if (emu->client >= 0) {
snd_seq_delete_kernel_client(emu->client); snd_seq_delete_kernel_client(emu->client);
emu->client = -1; emu->client = -1;
} }
mutex_unlock(&emu->register_mutex);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment