The driver field in the struct snd_ctl_card_info is a valid user space identifier. Actually, many ASoC drivers do not care and let to initialize this field using a standard wrapping method. Unfortunately, in this way, this field becomes unusable and unreadable for the drivers with longer card names. Also, there is a possibility to have clashes (driver field has only limit of 15 characters).
This change will print an error when the wrapping is used. The developers of the affected drivers should fix the problem.
Also, it does not make sense to set the driver field to the card name composed from DMI. This card name is longer in most (all?) cases. Use a generic "ASoC-DMI" string here.
Signed-off-by: Jaroslav Kysela perex@perex.cz --- sound/soc/soc-core.c | 41 +++++++++++++++++++++++++++-------------- 1 file changed, 27 insertions(+), 14 deletions(-)
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index e824ff1a9fc0..fd037208c222 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1840,21 +1840,22 @@ static void soc_check_tplg_fes(struct snd_soc_card *card) } }
-#define soc_setup_card_name(name, name1, name2, norm) \ - __soc_setup_card_name(name, sizeof(name), name1, name2, norm) -static void __soc_setup_card_name(char *name, int len, - const char *name1, const char *name2, - int normalization) +#define soc_setup_card_name(card, name, name1, name2) \ + __soc_setup_card_name(card, name, sizeof(name), name1, name2) +static void __soc_setup_card_name(struct snd_soc_card *card, + char *name, int len, + const char *name1, const char *name2) { + const char *src = name1 ? name1 : name2; int i;
- snprintf(name, len, "%s", name1 ? name1 : name2); + snprintf(name, len, "%s", src);
- if (!normalization) + if (name != card->snd_card->driver) return;
/* - * Name normalization + * Name normalization (driver field) * * The driver name is somewhat special, as it's used as a key for * searches in the user-space. @@ -1874,6 +1875,14 @@ static void __soc_setup_card_name(char *name, int len, break; } } + + /* + * The driver field should contain a valid string from the user view. + * The wrapping usually does not work so well here. Set a smaller string + * in the specific ASoC driver. + */ + if (strlen(src) > len - 1) + dev_err(card->dev, "ASoC: driver name too long '%s' -> '%s'\n", src, name); }
static void soc_cleanup_card_resources(struct snd_soc_card *card) @@ -1928,6 +1937,7 @@ static int snd_soc_bind_card(struct snd_soc_card *card) struct snd_soc_pcm_runtime *rtd; struct snd_soc_component *component; struct snd_soc_dai_link *dai_link; + const char *fallback; int ret, i;
mutex_lock(&client_mutex); @@ -2041,12 +2051,15 @@ static int snd_soc_bind_card(struct snd_soc_card *card) /* try to set some sane longname if DMI is available */ snd_soc_set_dmi_name(card, NULL);
- soc_setup_card_name(card->snd_card->shortname, - card->name, NULL, 0); - soc_setup_card_name(card->snd_card->longname, - card->long_name, card->name, 0); - soc_setup_card_name(card->snd_card->driver, - card->driver_name, card->name, 1); + soc_setup_card_name(card, card->snd_card->shortname, + card->name, NULL); + fallback = card->name; + soc_setup_card_name(card, card->snd_card->longname, + card->long_name, fallback); + if (card->long_name == card->dmi_longname) + fallback = "ASoC-DMI"; + soc_setup_card_name(card, card->snd_card->driver, + card->driver_name, fallback);
if (card->components) { /* the current implementation of snd_component_add() accepts */