Commit eb57c696 authored Nov 16, 2021 by Takashi Iwai Committed by Greg Kroah-Hartman Jan 27, 2022

ALSA: jack: Add missing rwsem around snd_ctl_remove() calls

[ Upstream commit 06764dc931848c3a9bc01a63bbf76a605408bb54 ]

snd_ctl_remove() has to be called with card->controls_rwsem held (when
called after the card instantiation).  This patch add the missing
rwsem calls around it.

Fixes: 9058cbe1 ("ALSA: jack: implement kctl creating for jack devices")
Link: https://lore.kernel.org/r/20211116071314.15065-1-tiwai@suse.de


Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 067f735c

sound/core/jack.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -68,10 +68,13 @@ static int snd_jack_dev_free(struct snd_device *device)
		struct snd_card *card = device->card;
		struct snd_jack_kctl jack_kctl, tmp_jack_kctl;

		down_write(&card->controls_rwsem);
		list_for_each_entry_safe(jack_kctl, tmp_jack_kctl, &jack->kctl_list, list) {
		list_del_init(&jack_kctl->list);
		snd_ctl_remove(card, jack_kctl->kctl);
		}
		up_write(&card->controls_rwsem);

		if (jack->private_free)
		jack->private_free(jack);