Skip to contentSkip to conversation

ASoC: core: Fix use-after-free after deferred card registration

PATCH In review Guenter Roeck 2 participants 3 messages Mar 26, 2019

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ASoC: core: Fix use-after-free after deferred card registration

If snd_soc_register_card() fails because one of its links fails to instantiate with -EPROBE_DEFER, and the to-be-registered link is a legacy link, a subsequent retry will trigger a use-after-free and quite often a system crash.

Example:

byt-max98090 byt-max98090: ASoC: failed to init link Baytrail Audio byt-max98090 byt-max98090: snd_soc_register_card failed -517
....

BUG: KASAN: use-after-free in snd_soc_init_platform+0x233/0x312
Read of size 8 at addr ffff888067c43070 by task kworker/1:1/23

snd_soc_init_platform() allocates memory attached to the card device. This memory is released when the card device is released. However, the pointer to the memory (dai_link->platforms) is only cleared from soc_cleanup_platform(), which is called from soc_cleanup_card_resources(), but not if snd_soc_register_card() fails early.

Add the missing call to soc_cleanup_platform() in the error handling code of snd_soc_register_card() to fix the problem.

Fixes 78a24e10cd94 ("ASoC: soc-core: clear platform pointers on error")
Cc Curtis Malainey <[email protected]>
---
 sound/soc/soc-core.c | 1 +
 1 file changed, 1 insertion(+)
sound/soc/soc-core.c +1 -0
index 93d316d5bf8e..6bf9884d0863 100644
@@ -2799,6 +2799,7 @@ int snd_soc_register_card(struct snd_soc_card *card)
 		if (ret) {
 			dev_err(card->dev, "ASoC: failed to init link %s\n",
 				link->name);
+			soc_cleanup_platform(card);
 			mutex_unlock(&client_mutex);
 			return ret;
 		}
Signature · 1 line
2.7.4
#1 lore raw

This has already been patched. See
https://mailman.alsa-project.org/pipermail/alsa-devel/2019-March/146150.html

Quoted 45 lines · Guenter Roeck

If snd_soc_register_card() fails because one of its links fails to instantiate with -EPROBE_DEFER, and the to-be-registered link is a legacy link, a subsequent retry will trigger a use-after-free and quite often a system crash.

Example:

byt-max98090 byt-max98090: ASoC: failed to init link Baytrail Audio byt-max98090 byt-max98090: snd_soc_register_card failed -517
....

BUG: KASAN: use-after-free in snd_soc_init_platform+0x233/0x312
Read of size 8 at addr ffff888067c43070 by task kworker/1:1/23

snd_soc_init_platform() allocates memory attached to the card device. This memory is released when the card device is released. However, the pointer to the memory (dai_link->platforms) is only cleared from soc_cleanup_platform(), which is called from soc_cleanup_card_resources(), but not if snd_soc_register_card() fails early.

Add the missing call to soc_cleanup_platform() in the error handling code of snd_soc_register_card() to fix the problem.

Fixes 78a24e10cd94 ("ASoC: soc-core: clear platform pointers on error")
Cc Curtis Malainey <[email protected]>
---
 sound/soc/soc-core.c | 1 +
 1 file changed, 1 insertion(+)
sound/soc/soc-core.c +1 -1
index 93d316d5bf8e..6bf9884d0863 100644
@@ -2799,6 +2799,7 @@ int snd_soc_register_card(struct snd_soc_card *card)
                if (ret) {
                        dev_err(card->dev, "ASoC: failed to init link %s\n",
                                link->name);
+                       soc_cleanup_platform(card);
                        mutex_unlock(&client_mutex);
                        return ret;
                }
--

2.7.4

#2 lore raw
Quoted 2 lines · Curtis Malainey

This has already been patched. See
https://mailman.alsa-project.org/pipermail/alsa-devel/2019-March/146150.html

Ah, obviously. I missed that one. Sorry for the noise.

Guenter

Quoted 47 lines · Guenter Roeck
Quoted 45 lines

If snd_soc_register_card() fails because one of its links fails to instantiate with -EPROBE_DEFER, and the to-be-registered link is a legacy link, a subsequent retry will trigger a use-after-free and quite often a system crash.

Example:

byt-max98090 byt-max98090: ASoC: failed to init link Baytrail Audio byt-max98090 byt-max98090: snd_soc_register_card failed -517
....

BUG: KASAN: use-after-free in snd_soc_init_platform+0x233/0x312
Read of size 8 at addr ffff888067c43070 by task kworker/1:1/23

snd_soc_init_platform() allocates memory attached to the card device. This memory is released when the card device is released. However, the pointer to the memory (dai_link->platforms) is only cleared from soc_cleanup_platform(), which is called from soc_cleanup_card_resources(), but not if snd_soc_register_card() fails early.

Add the missing call to soc_cleanup_platform() in the error handling code of snd_soc_register_card() to fix the problem.

Fixes 78a24e10cd94 ("ASoC: soc-core: clear platform pointers on error")
Cc Curtis Malainey <[email protected]>
---
 sound/soc/soc-core.c | 1 +
 1 file changed, 1 insertion(+)
sound/soc/soc-core.c +1 -1
index 93d316d5bf8e..6bf9884d0863 100644
@@ -2799,6 +2799,7 @@ int snd_soc_register_card(struct snd_soc_card *card)
                if (ret) {
                        dev_err(card->dev, "ASoC: failed to init link %s\n",
                                link->name);
+                       soc_cleanup_platform(card);
                        mutex_unlock(&client_mutex);
                        return ret;
                }
--

2.7.4