Unverified Commit e5169950 authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown
Browse files

ASoC: SOF: Intel: hda: add sanity check on SSP index reported by NHLT 



We should have a limited trust in the BIOS and verify that the SSP
index reported in NHLT is valid for each platform.

Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Link: https://lore.kernel.org/r/20220725195343.145603-2-pierre-louis.bossart@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent be0aa8d4

sound/soc/sof/intel/hda.c

+7 −0
Original line number Diff line number Diff line
@@ -1527,6 +1527,7 @@ struct snd_soc_acpi_mach *hda_machine_select(struct snd_sof_dev *sdev) 
		if (tplg_fixup &&

		    mach->tplg_quirk_mask & SND_SOC_ACPI_TPLG_INTEL_SSP_NUMBER &&

		    mach->mach_params.i2s_link_mask) {

			const struct sof_intel_dsp_desc *chip = get_chip_info(sdev->pdata);

			int ssp_num;



			if (hweight_long(mach->mach_params.i2s_link_mask) > 1 &&
@@ -1536,6 +1537,12 @@ struct snd_soc_acpi_mach *hda_machine_select(struct snd_sof_dev *sdev) 
			/* fls returns 1-based results, SSPs indices are 0-based */

			ssp_num = fls(mach->mach_params.i2s_link_mask) - 1;



			if (ssp_num >= chip->ssp_count) {

				dev_err(sdev->dev, "Invalid SSP %d, max on this platform is %d\n",

					ssp_num, chip->ssp_count);

				return NULL;

			}



			tplg_filename = devm_kasprintf(sdev->dev, GFP_KERNEL,

						       "%s%s%d",

						       sof_pdata->tplg_filename,