]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commit
ALSA: timer: Fix mutex deadlock at releasing card
authorTakashi Iwai <tiwai@suse.de>
Wed, 30 Oct 2019 21:42:57 +0000 (22:42 +0100)
committerKhalid Elmously <khalid.elmously@canonical.com>
Wed, 13 Nov 2019 23:47:34 +0000 (18:47 -0500)
commitb50b0dc189a368aa314d67e55e6f1e0588976687
tree34622327af98d07783263863badebde74c34f96f
parent2ec7970c73b4d171f17ac70b1f371bcba0043c27
ALSA: timer: Fix mutex deadlock at releasing card

BugLink: https://bugs.launchpad.net/bugs/1852492
[ Upstream commit a39331867335d4a94b6165e306265c9e24aca073 ]

When a card is disconnected while in use, the system waits until all
opened files are closed then releases the card.  This is done via
put_device() of the card device in each device release code.

The recently reported mutex deadlock bug happens in this code path;
snd_timer_close() for the timer device deals with the global
register_mutex and it calls put_device() there.  When this timer
device is the last one, the card gets freed and it eventually calls
snd_timer_free(), which has again the protection with the global
register_mutex -- boom.

Basically put_device() call itself is race-free, so a relative simple
workaround is to move this put_device() call out of the mutex.  For
achieving that, in this patch, snd_timer_close_locked() got a new
argument to store the card device pointer in return, and each caller
invokes put_device() with the returned object after the mutex unlock.

Reported-and-tested-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>
sound/core/timer.c