ASoC: core: Don't set "(null)" as a driver name
PATCH v2 1/1 ASoC: core: Don't set "(null)" as a driver name
Commit 22de71b ("ASoC: core - allow ASoC more flexible machine name") writes "(null)" to driver name string in struct snd_card if card->driver_name is NULL. This causes segmentation faults with some user space ALSA utilities like aplay and arecord.
Fix this by using the card->name if no driver name is specified.
--- sound/soc/soc-core.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
sound/soc/soc-core.c +1 -1
@@ -1930,7 +1930,7 @@ static void snd_soc_instantiate_card(struct snd_soc_card *card)snprintf (card->snd_card->longname,sizeof (card->snd_card->longname),"%s" , card->long_name ? card->long_name : card->name);snprintf (card->snd_card->driver,sizeof (card->snd_card->driver), -"%s" , card->driver_name); +"%s" , card->driver_name ? card->driver_name : card->name);if (card->late_probe) { ret = card->late_probe (card);
Signature · 1 line
1.7.4.4
Quoted 17 lines · Jarkko Nikula
Commit 22de71b ("ASoC: core - allow ASoC more flexible machine name") writes "(null)" to driver name string in struct
snd_cardifcard->driver_nameis NULL. This causes segmentation faults with some user space ALSA utilities like aplay and arecord.Fix this by using the
card->nameif no driver name is specified.Signed-off-by Jarkko Nikula <[email protected]>--- sound/soc/soc-core.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)sound/soc/soc-core.c +0
-0
sound/soc/soc-core.c static void snd_soc_instantiate_card(struct snd_soc_card *card) · line 1936
Quoted 8 lines
sound/soc/soc-core.c +1
-1@@ -1930,7 +1930,7 @@ static void snd_soc_instantiate_card(struct snd_soc_card *card)snprintf (card->snd_card->longname,sizeof (card->snd_card->longname),"%s" , card->long_name ? card->long_name : card->name);snprintf (card->snd_card->driver,sizeof (card->snd_card->driver), -"%s" , card->driver_name); +"%s" , card->driver_name ? card->driver_name : card->name);if (card->late_probe) { ret = card->late_probe (card);
Mark Brown
AppliedQuoted 4 lines · Jarkko Nikula
Commit 22de71b ("ASoC: core - allow ASoC more flexible machine name") writes "(null)" to driver name string in struct
snd_cardifcard->driver_nameis NULL. This causes segmentation faults with some user space ALSA utilities like aplay and arecord.
Applied, thanks.