diff options
| author | Takashi Iwai <tiwai@suse.de> | 2021-11-16 08:13:13 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-01-27 09:04:21 +0100 |
| commit | 38a9674ba3a03984413822935be4eb881fc913ef (patch) | |
| tree | dfdf38f3ee02df89c433afc1218286b7d671f4a9 /sound | |
| parent | 42209788a4bc211355a3663c54bd98aa5c902700 (diff) | |
| download | linux-stable-38a9674ba3a03984413822935be4eb881fc913ef.tar.gz linux-stable-38a9674ba3a03984413822935be4eb881fc913ef.tar.bz2 linux-stable-38a9674ba3a03984413822935be4eb881fc913ef.zip | |
ALSA: PCM: Add missing rwsem around snd_ctl_remove() calls
[ Upstream commit 5471e9762e1af4b7df057a96bfd46cc250979b88 ]
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: a8ff48cb7083 ("ALSA: pcm: Free chmap at PCM free callback, too")
Link: https://lore.kernel.org/r/20211116071314.15065-2-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/core/pcm.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sound/core/pcm.c b/sound/core/pcm.c index 01b9d62eef14..b6ed38dec435 100644 --- a/sound/core/pcm.c +++ b/sound/core/pcm.c @@ -874,7 +874,11 @@ EXPORT_SYMBOL(snd_pcm_new_internal); static void free_chmap(struct snd_pcm_str *pstr) { if (pstr->chmap_kctl) { - snd_ctl_remove(pstr->pcm->card, pstr->chmap_kctl); + struct snd_card *card = pstr->pcm->card; + + down_write(&card->controls_rwsem); + snd_ctl_remove(card, pstr->chmap_kctl); + up_write(&card->controls_rwsem); pstr->chmap_kctl = NULL; } } |