]> git.baikalelectronics.ru Git - kernel.git/commitdiff
ASoC: SOF: Intel: hda: add sanity check on SSP index reported by NHLT
authorPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Mon, 25 Jul 2022 19:53:41 +0000 (14:53 -0500)
committerMark Brown <broonie@kernel.org>
Mon, 25 Jul 2022 21:37:00 +0000 (22:37 +0100)
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: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: Bard 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: Mark Brown <broonie@kernel.org>
sound/soc/sof/intel/hda.c

index d337d55050e203f9afd9baad2ac7453150b895ad..8639ea63a10dbb1baceef97ab2710b27ea9b4ad5 100644 (file)
@@ -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,