Unverified Commit 7d99a70b authored Feb 10, 2024 by Hans de Goede Committed by Mark Brown Feb 11, 2024

ASoC: Intel: Boards: Fix NULL pointer deref in BYT/CHT boards



Since commit 13f58267 ("ASoC: soc.h: don't create dummy Component
via COMP_DUMMY()") dummy snd_soc_dai_link.codecs entries no longer
have a name set.

This means that when looking for the codec dai_link the machine
driver can no longer unconditionally run strcmp() on
snd_soc_dai_link.codecs[0].name since this may now be NULL.

Add a check for snd_soc_dai_link.codecs[0].name being NULL to all
BYT/CHT machine drivers to avoid NULL pointer dereferences in
their probe() methods.

Fixes: 13f58267 ("ASoC: soc.h: don't create dummy Component via COMP_DUMMY()")
Cc: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20240210134400.24913-2-hdegoede@redhat.com


Signed-off-by: Mark Brown <broonie@kernel.org>

parent 727b9432

sound/soc/intel/boards/bytcht_cx2072x.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -241,7 +241,8 @@ static int snd_byt_cht_cx2072x_probe(struct platform_device *pdev)

		/* fix index of codec dai */
		for (i = 0; i < ARRAY_SIZE(byt_cht_cx2072x_dais); i++) {
		if (!strcmp(byt_cht_cx2072x_dais[i].codecs->name,
		if (byt_cht_cx2072x_dais[i].codecs->name &&
		!strcmp(byt_cht_cx2072x_dais[i].codecs->name,
		"i2c-14F10720:00")) {
		dai_index = i;
		break;

sound/soc/intel/boards/bytcht_da7213.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -245,7 +245,8 @@ static int bytcht_da7213_probe(struct platform_device *pdev)

		/* fix index of codec dai */
		for (i = 0; i < ARRAY_SIZE(dailink); i++) {
		if (!strcmp(dailink[i].codecs->name, "i2c-DLGS7213:00")) {
		if (dailink[i].codecs->name &&
		!strcmp(dailink[i].codecs->name, "i2c-DLGS7213:00")) {
		dai_index = i;
		break;
		}

sound/soc/intel/boards/bytcht_es8316.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -546,7 +546,8 @@ static int snd_byt_cht_es8316_mc_probe(struct platform_device *pdev)

		/* fix index of codec dai */
		for (i = 0; i < ARRAY_SIZE(byt_cht_es8316_dais); i++) {
		if (!strcmp(byt_cht_es8316_dais[i].codecs->name,
		if (byt_cht_es8316_dais[i].codecs->name &&
		!strcmp(byt_cht_es8316_dais[i].codecs->name,
		"i2c-ESSX8316:00")) {
		dai_index = i;
		break;

sound/soc/intel/boards/bytcr_rt5640.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -1652,7 +1652,8 @@ static int snd_byt_rt5640_mc_probe(struct platform_device *pdev)

		/* fix index of codec dai */
		for (i = 0; i < ARRAY_SIZE(byt_rt5640_dais); i++) {
		if (!strcmp(byt_rt5640_dais[i].codecs->name,
		if (byt_rt5640_dais[i].codecs->name &&
		!strcmp(byt_rt5640_dais[i].codecs->name,
		"i2c-10EC5640:00")) {
		dai_index = i;
		break;

sound/soc/intel/boards/bytcr_rt5651.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -910,7 +910,8 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev)

		/* fix index of codec dai */
		for (i = 0; i < ARRAY_SIZE(byt_rt5651_dais); i++) {
		if (!strcmp(byt_rt5651_dais[i].codecs->name,
		if (byt_rt5651_dais[i].codecs->name &&
		!strcmp(byt_rt5651_dais[i].codecs->name,
		"i2c-10EC5651:00")) {
		dai_index = i;
		break;