lkml.org 
[lkml]   [2022]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 241/563] ALSA: hda: Add missing rwsem around snd_ctl_remove() calls
    Date
    From: Takashi Iwai <tiwai@suse.de>

    [ Upstream commit 80bd64af75b4bb11c0329bc66c35da2ddfb66d88 ]

    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: d13bd412dce2 ("ALSA: hda - Manage kcontrol lists")
    Link: https://lore.kernel.org/r/20211116071314.15065-3-tiwai@suse.de
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    sound/pci/hda/hda_codec.c | 3 +++
    1 file changed, 3 insertions(+)

    diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
    index 6dece719be669..39281106477eb 100644
    --- a/sound/pci/hda/hda_codec.c
    +++ b/sound/pci/hda/hda_codec.c
    @@ -1727,8 +1727,11 @@ void snd_hda_ctls_clear(struct hda_codec *codec)
    {
    int i;
    struct hda_nid_item *items = codec->mixers.list;
    +
    + down_write(&codec->card->controls_rwsem);
    for (i = 0; i < codec->mixers.used; i++)
    snd_ctl_remove(codec->card, items[i].kctl);
    + up_write(&codec->card->controls_rwsem);
    snd_array_free(&codec->mixers);
    snd_array_free(&codec->nids);
    }
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-01-24 22:41    [W:2.246 / U:0.056 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site