]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ASoC: soc-core: flush delayed work before removing DAIs and widgets
authormatteo.cotifava <cotifavamatteo@gmail.com>
Mon, 9 Mar 2026 21:54:12 +0000 (22:54 +0100)
committerMark Brown <broonie@kernel.org>
Mon, 9 Mar 2026 22:22:41 +0000 (22:22 +0000)
When a sound card is unbound while a PCM stream is open, a
use-after-free can occur in snd_soc_dapm_stream_event(), called from
the close_delayed_work workqueue handler.

During unbind, snd_soc_unbind_card() flushes delayed work and then
calls soc_cleanup_card_resources(). Inside cleanup,
snd_card_disconnect_sync() releases all PCM file descriptors, and
the resulting PCM close path can call snd_soc_dapm_stream_stop()
which schedules new delayed work with a pmdown_time timer delay.
Since this happens after the flush in snd_soc_unbind_card(), the
new work is not caught. soc_remove_link_components() then frees
DAPM widgets before this work fires, leading to the use-after-free.

The existing flush in soc_free_pcm_runtime() also cannot help as it
runs after soc_remove_link_components() has already freed the widgets.

Add a flush in soc_cleanup_card_resources() after
snd_card_disconnect_sync() (after which no new PCM closes can
schedule further delayed work) and before soc_remove_link_dais()
and soc_remove_link_components() (which tear down the structures the
delayed work accesses).

Fixes: e894efef9ac7 ("ASoC: core: add support to card rebind")
Signed-off-by: Matteo Cotifava <cotifavamatteo@gmail.com>
Link: https://patch.msgid.link/20260309215412.545628-3-cotifavamatteo@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/soc-core.c

index e5ac8ae1665dfc8d6198f3e3172bd971abb0ef7b..cf826c2a8b5933e8282d7f839bbccd1b4a8d631a 100644 (file)
@@ -2121,6 +2121,9 @@ static void soc_cleanup_card_resources(struct snd_soc_card *card)
        for_each_card_rtds(card, rtd)
                if (rtd->initialized)
                        snd_soc_link_exit(rtd);
+       /* flush delayed work before removing DAIs and DAPM widgets */
+       snd_soc_flush_all_delayed_work(card);
+
        /* remove and free each DAI */
        soc_remove_link_dais(card);
        soc_remove_link_components(card);