Skip to content

Commit 9a93889

Browse files
tiwaigregkh
authored andcommitted
ASoC: Fix use-after-free at card unregistration
commit 4efda5f2130da033aeedc5b3205569893b910de2 upstream. soc_cleanup_card_resources() call snd_card_free() at the last of its procedure. This turned out to lead to a use-after-free. PCM runtimes have been already removed via soc_remove_pcm_runtimes(), while it's dereferenced later in soc_pcm_free() called via snd_card_free(). The fix is simple: just move the snd_card_free() call to the beginning of the whole procedure. This also gives another benefit: it guarantees that all operations have been shut down before actually releasing the resources, which was racy until now. Reported-and-tested-by: Robert Jarzmik <robert.jarzmik@free.fr> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 54d12fb commit 9a93889

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

sound/soc/soc-core.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1775,6 +1775,9 @@ static int soc_cleanup_card_resources(struct snd_soc_card *card)
17751775
for (i = 0; i < card->num_aux_devs; i++)
17761776
soc_remove_aux_dev(card, i);
17771777

1778+
/* free the ALSA card at first; this syncs with pending operations */
1779+
snd_card_free(card->snd_card);
1780+
17781781
/* remove and free each DAI */
17791782
soc_remove_dai_links(card);
17801783

@@ -1786,9 +1789,7 @@ static int soc_cleanup_card_resources(struct snd_soc_card *card)
17861789

17871790
snd_soc_dapm_free(&card->dapm);
17881791

1789-
snd_card_free(card->snd_card);
17901792
return 0;
1791-
17921793
}
17931794

17941795
/* removes a socdev */

0 commit comments

Comments
 (0)